diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index 66a1cc5..9d11b55 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -94,19 +94,27 @@ jobs: steps: - name: Checkout source repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: clean: true submodules: 'true' fetch-depth: 0 - name: Set up JDK ${{ matrix.java-version }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'corretto' 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-java${{ matrix.java-version}}-lib + restore-keys: ${{ runner.os }}-bld-java${{ matrix.java-version}}-lib + - name: Download dependencies run: ./bld clean download @@ -135,19 +143,27 @@ jobs: steps: - name: Checkout source repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: clean: true submodules: 'true' fetch-depth: 0 - name: Set up JDK ${{ matrix.java-version }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'corretto' 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-java${{ matrix.java-version}}-lib + restore-keys: ${{ runner.os }}-bld-java${{ matrix.java-version}}-lib + - name: Download dependencies run: ./bld clean download @@ -174,19 +190,27 @@ jobs: run: git config --global core.autocrlf input - name: Checkout source repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: clean: true submodules: 'true' fetch-depth: 0 - name: Set up JDK ${{ matrix.java-version }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'corretto' 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-java${{ matrix.java-version}}-lib + restore-keys: ${{ runner.os }}-bld-java${{ matrix.java-version}}-lib + - name: Download dependencies run: .\bld.bat clean download diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 7acbfa3..1679e89 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -22,6 +22,7 @@ concurrency: jobs: # Single deploy job since we're just deploying deploy: + if: github.repository == 'rife2/bld' environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} @@ -30,14 +31,14 @@ jobs: steps: - name: Checkout source repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: clean: true submodules: 'true' fetch-depth: 0 - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'corretto' java-version: 17 @@ -46,14 +47,14 @@ jobs: run: ./bld clean download clean compile javadoc - name: Setup Pages - uses: actions/configure-pages@v5 + uses: actions/configure-pages@v6 - name: Upload artifact - uses: actions/upload-pages-artifact@v3 + uses: actions/upload-pages-artifact@v5 with: # Upload generated Javadocs repository path: 'build/javadoc/' - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v4 \ No newline at end of file + uses: actions/deploy-pages@v5 \ No newline at end of file diff --git a/.github/workflows/purge-cache.yml b/.github/workflows/purge-cache.yml new file mode 100644 index 0000000..1ec6c72 --- /dev/null +++ b/.github/workflows/purge-cache.yml @@ -0,0 +1,27 @@ +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 }}" \ No newline at end of file diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 3d1879e..effa77e 100644 --- a/lib/bld/bld-wrapper.properties +++ b/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:0.9.2 +bld.extension-reporter=com.uwyn.rife2:bld-junit-reporter:1.2.0-SNAPSHOT bld.extension-tests=com.uwyn.rife2:bld-tests-badge:1.6.3 bld.javaOptions= bld.javacOptions= -bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES +bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES,RIFE2_SNAPSHOTS bld.sourceDirectories=core/src/bld/java -bld.version=2.3.0 \ No newline at end of file +bld.version=2.3.1-SNAPSHOT \ No newline at end of file