From d360837e80bd74aeb3e893744a6ce4f7edc210f5 Mon Sep 17 00:00:00 2001 From: "blacksmith-sh[bot]" <157653362+blacksmith-sh[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2024 22:10:41 +0000 Subject: [PATCH 1/2] Migrate workflows to Blacksmith --- .github/workflows/flex-build.yml | 6 +++--- .github/workflows/lifecycle.yml | 10 +++++----- .github/workflows/run-gametests.yml | 4 ++-- .github/workflows/test-local-action.yml | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/flex-build.yml b/.github/workflows/flex-build.yml index e194bc6..499c3e6 100644 --- a/.github/workflows/flex-build.yml +++ b/.github/workflows/flex-build.yml @@ -33,7 +33,7 @@ name: Flex Build jobs: build: # TODO: add build attestation and generate then combine gradle dependency graphs for SBOM name: Build ${{ inputs.dir }}/${{ inputs.mc }} - runs-on: ubuntu-22.04 + runs-on: blacksmith-2vcpu-ubuntu-2204 steps: - name: Checkout uses: actions/checkout@v4 @@ -45,14 +45,14 @@ jobs: - name: Cache build id: cache - uses: actions/cache@v4 + uses: useblacksmith/cache@v5 with: path: ${{ inputs.dir }}/build key: build-${{ hashFiles(format('{0}/[a-z]**', inputs.dir), 'api/**') }} - if: steps.cache.outputs.cache-hit != 'true' name: Setup Java - uses: actions/setup-java@v4 + uses: useblacksmith/setup-java@v5 with: distribution: temurin java-version: ${{ inputs.java }} diff --git a/.github/workflows/lifecycle.yml b/.github/workflows/lifecycle.yml index 7e86f4c..fdd5ef8 100644 --- a/.github/workflows/lifecycle.yml +++ b/.github/workflows/lifecycle.yml @@ -30,7 +30,7 @@ concurrency: # FIXME: prevent release commit cancellation jobs: release-please: name: Release Please - runs-on: ubuntu-22.04 + runs-on: blacksmith-2vcpu-ubuntu-2204 outputs: release_created: ${{ steps.release-please.outputs.release_created }} tag_name: ${{ steps.release-please.outputs.tag_name }} @@ -49,7 +49,7 @@ jobs: if: github.event.action != 'closed' name: Construct matrices needs: release-please - runs-on: ubuntu-22.04 + runs-on: blacksmith-2vcpu-ubuntu-2204 outputs: build-matrix: ${{ steps.matrices.outputs.build-matrix }} run-matrix: ${{ steps.matrices.outputs.run-matrix }} @@ -220,7 +220,7 @@ jobs: needs: - matrices - build - runs-on: ubuntu-22.04 + runs-on: blacksmith-2vcpu-ubuntu-2204 strategy: fail-fast: false matrix: @@ -268,7 +268,7 @@ jobs: name: Release permissions: contents: write - runs-on: ubuntu-22.04 + runs-on: blacksmith-2vcpu-ubuntu-2204 steps: - name: Download artifacts uses: actions/download-artifact@v4 @@ -296,7 +296,7 @@ jobs: needs: - run - release - runs-on: ubuntu-22.04 + runs-on: blacksmith-2vcpu-ubuntu-2204 steps: - name: Delete artifacts uses: geekyeggo/delete-artifact@v5.1.0 diff --git a/.github/workflows/run-gametests.yml b/.github/workflows/run-gametests.yml index a32b9f1..6ad9e8d 100644 --- a/.github/workflows/run-gametests.yml +++ b/.github/workflows/run-gametests.yml @@ -23,7 +23,7 @@ jobs: # TODO: add cleanup job merge: # TODO: simplify away this job name: Merge needs: [build] - runs-on: ubuntu-latest + runs-on: blacksmith-2vcpu-ubuntu-2204 steps: - name: Merge artifacts uses: actions/upload-artifact/merge@v4 @@ -39,7 +39,7 @@ jobs: # TODO: add cleanup job - { mc: 1.20.4, type: lexforge, modloader: forge, regex: .*forge.*, java: 17 } - { mc: 1.20.4, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 17 } - { mc: 1.20.4, type: fabric, modloader: fabric, regex: .*fabric.*, java: 17 } - runs-on: ubuntu-22.04 + runs-on: blacksmith-2vcpu-ubuntu-2204 steps: - name: Download artifacts uses: actions/download-artifact@v4 diff --git a/.github/workflows/test-local-action.yml b/.github/workflows/test-local-action.yml index f7bef7c..30e469b 100644 --- a/.github/workflows/test-local-action.yml +++ b/.github/workflows/test-local-action.yml @@ -41,7 +41,7 @@ env: jobs: run: name: Run test - runs-on: ubuntu-22.04 + runs-on: blacksmith-2vcpu-ubuntu-2204 steps: - name: Checkout uses: actions/checkout@v4 @@ -50,7 +50,7 @@ jobs: ref: ${{ github.event.inputs.ref }} - name: Setup temurin-${{ env.java_version }} - uses: actions/setup-java@v4 + uses: useblacksmith/setup-java@v5 with: java-version: ${{ env.java_version }} distribution: temurin From 3f8553a5dc79400206447b2fe3706aa4357bd84a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chip=20Wolf=20=E2=80=AE?= Date: Thu, 5 Dec 2024 22:15:25 +0000 Subject: [PATCH 2/2] chore(ci): use blacksmith cache and setup actions --- .github/workflows/flex-build.yml | 2 +- .github/workflows/lifecycle.yml | 2 +- .github/workflows/run-gametests.yml | 2 +- README.md | 2 +- action.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/flex-build.yml b/.github/workflows/flex-build.yml index 499c3e6..8e978be 100644 --- a/.github/workflows/flex-build.yml +++ b/.github/workflows/flex-build.yml @@ -59,7 +59,7 @@ jobs: - if: steps.cache.outputs.cache-hit != 'true' name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: useblacksmith/setup-gradle/setup-gradle@v5 with: workflow-job-context: '{}' # FIXME: avoid this cache duplication workaround diff --git a/.github/workflows/lifecycle.yml b/.github/workflows/lifecycle.yml index fdd5ef8..1e07b20 100644 --- a/.github/workflows/lifecycle.yml +++ b/.github/workflows/lifecycle.yml @@ -243,7 +243,7 @@ jobs: cp mc-runtime-test-*-${{ matrix.version.type }}-release.jar run/mods - name: Setup Java temurin-${{ matrix.version.java }} - uses: actions/setup-java@v4 + uses: useblacksmith/setup-java@v5 with: java-version: ${{ matrix.version.java }} distribution: temurin diff --git a/.github/workflows/run-gametests.yml b/.github/workflows/run-gametests.yml index 6ad9e8d..6b782c1 100644 --- a/.github/workflows/run-gametests.yml +++ b/.github/workflows/run-gametests.yml @@ -51,7 +51,7 @@ jobs: # TODO: add cleanup job cp merged-artifacts/mc-runtime-test-${{ matrix.mc }}-*-${{ matrix.type }}-release.jar run/mods - name: Setup temurin-${{ matrix.java }} - uses: actions/setup-java@v4 + uses: useblacksmith/setup-java@v5 with: java-version: ${{ matrix.java }} distribution: temurin diff --git a/README.md b/README.md index 5a6e516..4b2f5f3 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install Java - uses: actions/setup-java@v4 + uses: useblacksmith/setup-java@v5 with: java-version: ${{ env.java_version }} distribution: "temurin" diff --git a/action.yml b/action.yml index f888503..51131c6 100644 --- a/action.yml +++ b/action.yml @@ -76,7 +76,7 @@ runs: - if: inputs.cache-mc == 'true' name: Cache Minecraft - uses: actions/cache@v4 + uses: useblacksmith/cache@v5 with: path: /home/runner/.minecraft key: hmc-${{ inputs.modloader }}-${{ inputs.mc }}