From fb80af5180ec9e1d9700b7dafb1a79ec9fef2c66 Mon Sep 17 00:00:00 2001 From: galargh Date: Tue, 21 Mar 2023 15:26:07 +0100 Subject: [PATCH] fix: ensure unique job names across all GHA workflows --- .github/workflows/build.yml | 10 +++++----- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/docker-build.yml | 2 +- .github/workflows/gobuild.yml | 8 ++++---- .github/workflows/golang-analysis.yml | 2 +- .github/workflows/golint.yml | 2 +- .github/workflows/gotest.yml | 2 +- .github/workflows/sharness.yml | 20 ++++++++++---------- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4a61e18b095..15f467f742d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ env: GO_VERSION: 1.19.1 jobs: - prepare: + interop-prep: if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch' runs-on: ubuntu-latest timeout-minutes: 5 @@ -39,7 +39,7 @@ jobs: name: kubo path: cmd/ipfs/ipfs interop: - needs: [prepare] + needs: [interop-prep] runs-on: ubuntu-latest timeout-minutes: 20 defaults: @@ -77,7 +77,7 @@ jobs: IPFS_GO_EXEC: ${{ github.workspace }}/cmd/ipfs/ipfs working-directory: interop go-ipfs-api: - needs: [prepare] + needs: [interop-prep] runs-on: ubuntu-latest timeout-minutes: 5 env: @@ -117,7 +117,7 @@ jobs: - run: cmd/ipfs/ipfs shutdown if: always() go-ipfs-http-client: - needs: [prepare] + needs: [interop-prep] runs-on: ubuntu-latest timeout-minutes: 5 env: @@ -151,7 +151,7 @@ jobs: - run: go test -count=1 -v ./... working-directory: go-ipfs-http-client ipfs-webui: - needs: [prepare] + needs: [interop-prep] runs-on: ubuntu-latest timeout-minutes: 20 env: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 800741b2ebc..e2fa78befd7 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -16,7 +16,7 @@ permissions: security-events: write # (github/codeql-action/autobuild) jobs: - go: + codeql: if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch' runs-on: ubuntu-latest timeout-minutes: 20 diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 2d76cc8ebba..ea6c9d9b3d8 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -8,7 +8,7 @@ on: - 'master' jobs: - head: + docker-build: if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch' runs-on: ubuntu-latest timeout-minutes: 10 diff --git a/.github/workflows/gobuild.yml b/.github/workflows/gobuild.yml index 9fe8833920f..f80fb820514 100644 --- a/.github/workflows/gobuild.yml +++ b/.github/workflows/gobuild.yml @@ -8,12 +8,12 @@ on: - 'master' jobs: - runner: + go-build-runner: if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch' uses: ipfs/kubo/.github/workflows/runner.yml@master - build: - needs: [runner] - runs-on: ${{ fromJSON(needs.runner.outputs.config).labels }} + go-build: + needs: [go-build-runner] + runs-on: ${{ fromJSON(needs.go-build-runner.outputs.config).labels }} timeout-minutes: 20 env: TEST_NO_DOCKER: 1 diff --git a/.github/workflows/golang-analysis.yml b/.github/workflows/golang-analysis.yml index 5db740ee9b4..d3fead57c10 100644 --- a/.github/workflows/golang-analysis.yml +++ b/.github/workflows/golang-analysis.yml @@ -11,7 +11,7 @@ permissions: contents: read # to fetch code (actions/checkout) jobs: - check: + go-check: if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch' runs-on: ubuntu-latest timeout-minutes: 10 diff --git a/.github/workflows/golint.yml b/.github/workflows/golint.yml index 524beb01891..621a2807a99 100644 --- a/.github/workflows/golint.yml +++ b/.github/workflows/golint.yml @@ -8,7 +8,7 @@ on: - 'master' jobs: - lint: + go-lint: if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch' runs-on: ubuntu-latest timeout-minutes: 10 diff --git a/.github/workflows/gotest.yml b/.github/workflows/gotest.yml index 76c090c2fe0..3867271ca19 100644 --- a/.github/workflows/gotest.yml +++ b/.github/workflows/gotest.yml @@ -8,7 +8,7 @@ on: - 'master' jobs: - test: + go-test: if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch' runs-on: ubuntu-latest timeout-minutes: 20 diff --git a/.github/workflows/sharness.yml b/.github/workflows/sharness.yml index 8e29386ff38..7b392bcd992 100644 --- a/.github/workflows/sharness.yml +++ b/.github/workflows/sharness.yml @@ -8,12 +8,12 @@ on: - 'master' jobs: - runner: + sharness-runner: if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch' uses: ipfs/kubo/.github/workflows/runner.yml@master - test: - needs: [runner] - runs-on: ${{ fromJSON(needs.runner.outputs.config).labels }} + sharness-test: + needs: [sharness-runner] + runs-on: ${{ fromJSON(needs.sharness-runner.outputs.config).labels }} timeout-minutes: 20 defaults: run: @@ -67,7 +67,7 @@ jobs: TEST_EXPENSIVE: 1 IPFS_CHECK_RCMGR_DEFAULTS: 1 CONTINUE_ON_S_FAILURE: 1 - PARALLEL: ${{ fromJSON(needs.runner.outputs.config).parallel }} + PARALLEL: ${{ fromJSON(needs.sharness-runner.outputs.config).parallel }} - name: Upload coverage report uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0 if: failure() || success() @@ -96,12 +96,12 @@ jobs: - name: Upload one-page HTML report to S3 id: one-page uses: pl-strflt/tf-aws-gh-runner/.github/actions/upload-artifact@main - if: fromJSON(needs.runner.outputs.config).aws && (failure() || success()) + if: fromJSON(needs.sharness-runner.outputs.config).aws && (failure() || success()) with: source: kubo/test/sharness/test-results/sharness.html destination: sharness.html - name: Upload one-page HTML report - if: (! fromJSON(needs.runner.outputs.config).aws) && (failure() || success()) + if: (! fromJSON(needs.sharness-runner.outputs.config).aws) && (failure() || success()) uses: actions/upload-artifact@v3 with: name: sharness.html @@ -116,18 +116,18 @@ jobs: - name: Upload full HTML report to S3 id: full uses: pl-strflt/tf-aws-gh-runner/.github/actions/upload-artifact@main - if: fromJSON(needs.runner.outputs.config).aws && (failure() || success()) + if: fromJSON(needs.sharness-runner.outputs.config).aws && (failure() || success()) with: source: kubo/test/sharness/test-results/sharness-html destination: sharness-html/ - name: Upload full HTML report - if: (! fromJSON(needs.runner.outputs.config).aws) && (failure() || success()) + if: (! fromJSON(needs.sharness-runner.outputs.config).aws) && (failure() || success()) uses: actions/upload-artifact@v3 with: name: sharness-html path: kubo/test/sharness/test-results/sharness-html - name: Add S3 links to the summary - if: fromJSON(needs.runner.outputs.config).aws && (failure() || success()) + if: fromJSON(needs.sharness-runner.outputs.config).aws && (failure() || success()) run: echo "$MD" >> $GITHUB_STEP_SUMMARY env: MD: |