From 91d2b664000c776c8c9fa72609fc60e0352149cf Mon Sep 17 00:00:00 2001 From: Mike Zorn Date: Fri, 21 Feb 2025 13:20:46 -0800 Subject: [PATCH 1/2] Build first this way pre-commit won't timeout when we refresh the module cache --- .github/workflows/go.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 1c3c64b0..cc405dba 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -20,10 +20,10 @@ jobs: uses: actions/setup-go@v4 with: go-version: stable + - name: build + run: go build . - uses: actions/setup-python@v3 - uses: pre-commit/action@v3.0.1 - - name: build - run: go build . - name: test run: go test ./... From e087f3cfca325bdece918485051b87897529337e Mon Sep 17 00:00:00 2001 From: Mike Zorn Date: Fri, 21 Feb 2025 14:25:29 -0800 Subject: [PATCH 2/2] remove extraneous go version action --- .github/workflows/manual-publish.yml | 5 +---- .github/workflows/release-please.yml | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/manual-publish.yml b/.github/workflows/manual-publish.yml index 466ed67e..b9882614 100644 --- a/.github/workflows/manual-publish.yml +++ b/.github/workflows/manual-publish.yml @@ -18,11 +18,8 @@ on: type: string jobs: - go-versions: - uses: ./.github/workflows/go-versions.yml release-ldcli: - needs: go-versions permissions: id-token: write # Needed to obtain Docker tokens contents: write # Needed to upload release artifacts @@ -84,7 +81,7 @@ jobs: actions: read id-token: write contents: write - uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v1.10.0 + uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v2.0.0 with: base64-subjects: "${{ needs.release-ldcli.outputs.hashes }}" upload-assets: true diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index d43be0d4..5e99fa76 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -7,9 +7,6 @@ on: - main jobs: - go-versions: - uses: ./.github/workflows/go-versions.yml - release-please: runs-on: ubuntu-latest if: github.event_name == 'push' @@ -26,7 +23,7 @@ jobs: permissions: id-token: write # Needed to obtain Docker tokens contents: write # Needed to upload release artifacts - needs: [ release-please, go-versions ] + needs: [ release-please ] if: always() && (needs.release-please.outputs.release_created == 'true' || github.event_name == 'pull_request') runs-on: ubuntu-latest outputs: