Merge d7142fa5c8 into 45c86e7efa

.github/workflows/bld.yml

@@ -107,32 +107,8 @@ jobs:
           java-version: ${{ matrix.java-version }}
           check-latest: true
 
-      - name: Cache bld dependencies
-        id: cache-bld
-        uses: actions/cache@v5
-        with:
-          path: lib
-          key: ${{ runner.os }}-bld-${{ hashFiles('lib/bld/bld-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-bld-
-
-      - name: Check for bld cache
-        id: check-cache
-        shell: bash
-        run: |
-          if [ -f "lib/bld/bld.cache" ]; then
-            echo "cache_exists=true" >> $GITHUB_OUTPUT
-          else
-            echo "cache_exists=false" >> $GITHUB_OUTPUT
-          fi
-
       - name: Download dependencies
-        if: steps.check-cache.outputs.cache_exists == 'false'
+        run: ./bld clean download
-        run: ./bld clean download purge
-
-      - name: Update dependencies
-        if: steps.check-cache.outputs.cache_exists == 'true'
-        run: ./bld clean updates
 
       - name: Compile source
         run: ./bld compile
@@ -172,32 +148,8 @@ jobs:
           java-version: ${{ matrix.java-version }}
           check-latest: true
 
-      - name: Cache bld dependencies
-        id: cache-bld
-        uses: actions/cache@v5
-        with:
-          path: lib
-          key: ${{ runner.os }}-bld-${{ hashFiles('lib/bld/bld-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-bld-
-
-      - name: Check for bld cache
-        id: check-cache
-        shell: bash
-        run: |
-          if [ -f "lib/bld/bld.cache" ]; then
-            echo "cache_exists=true" >> $GITHUB_OUTPUT
-          else
-            echo "cache_exists=false" >> $GITHUB_OUTPUT
-          fi
-
       - name: Download dependencies
-        if: steps.check-cache.outputs.cache_exists == 'false'
+        run: ./bld clean download
-        run: ./bld clean download purge
-
-      - name: Update dependencies
-        if: steps.check-cache.outputs.cache_exists == 'true'
-        run: ./bld clean updates
 
       - name: Compile source
         run: ./bld compile
@@ -235,32 +187,8 @@ jobs:
           java-version: ${{ matrix.java-version }}
           check-latest: true
 
-      - name: Cache bld dependencies
-        id: cache-bld
-        uses: actions/cache@v5
-        with:
-          path: lib
-          key: ${{ runner.os }}-bld-${{ hashFiles('lib/bld/bld-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-bld-
-
-      - name: Check for bld cache
-        id: check-cache
-        shell: bash
-        run: |
-          if [ -f "lib/bld/bld.cache" ]; then
-            echo "cache_exists=true" >> $GITHUB_OUTPUT
-          else
-            echo "cache_exists=false" >> $GITHUB_OUTPUT
-          fi
-
       - name: Download dependencies
-        if: steps.check-cache.outputs.cache_exists == 'false'
+        run: .\bld.bat clean download
-        run: .\bld.bat download purge
-
-      - name: Update dependencies
-        if: steps.check-cache.outputs.cache_exists == 'true'
-        run: .\bld.bat updates
 
       - name: Compile source
         run: .\bld.bat compile

.github/workflows/purge-cache.yml

@@ -1,27 +0,0 @@
-name: purge-cache
-
-on:
-  workflow_dispatch:
-    inputs:
-      confirm:
-        description: 'Type "yes" to confirm purging all bld caches'
-        required: true
-        default: 'no'
-
-jobs:
-  clear-cache:
-    if: github.event.inputs.confirm == 'yes'
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-    runs-on: ${{ matrix.os }}
-    permissions:
-      actions: write
-    steps:
-      - name: Purge bld caches for ${{ runner.os }}
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          echo "Purging all caches with key ${{ runner.os }}-bld-"
-          gh cache delete --all --key "${{ runner.os }}-bld-"
-          echo "Done for ${{ runner.os }}"

lib/bld/bld-wrapper.properties

@@ -3,10 +3,10 @@ bld.downloadExtensionSources=true
 bld.downloadLocation=
 bld.extension-antlr=com.uwyn.rife2:bld-antlr4:1.4.3
 bld.extension-archive=com.uwyn.rife2:bld-archive:0.6.3
-bld.extension-reporter=com.uwyn.rife2:bld-junit-reporter:1.2.0-SNAPSHOT
+bld.extension-reporter=com.uwyn.rife2:bld-junit-reporter:0.9.2
 bld.extension-tests=com.uwyn.rife2:bld-tests-badge:1.6.3
 bld.javaOptions=
 bld.javacOptions=
-bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES,RIFE2_SNAPSHOTS
+bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES
 bld.sourceDirectories=core/src/bld/java
 bld.version=2.3.0