From b34cb04c7386cb06c0807b1c9091b64f36355e63 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Fri, 5 May 2023 07:49:01 +0200 Subject: [PATCH 1/2] chore: concurrency fixes --- .github/workflows/test-integration.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index 9e662d6a67..001c8369b3 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -6,7 +6,7 @@ on: branches: [main] concurrency: - group: ${{ github.head_ref || github.run_id }} + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true jobs: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3cc63ecc5d..ef62864dd5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ on: - cron: '0 0 * * *' concurrency: - group: ${{ github.head_ref || github.run_id }} + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true jobs: From 8af107f6a798700dce975bb819b67482bfd334ab Mon Sep 17 00:00:00 2001 From: LekoArts Date: Fri, 5 May 2023 07:52:08 +0200 Subject: [PATCH 2/2] chore: update third-party actions --- .github/workflows/cypress-canary.yml | 6 +++--- .github/workflows/cypress-demo-nx.yml | 6 +++--- .github/workflows/cypress-demo-static.yml | 6 +++--- .github/workflows/cypress-demo.yml | 6 +++--- .github/workflows/cypress-middleware.yml | 6 +++--- .github/workflows/e2e-appdir.yml | 2 +- .github/workflows/e2e-next.yml | 2 +- .github/workflows/pre-release.yml | 4 ++-- .github/workflows/release-please.yml | 4 ++-- .github/workflows/test-deno.yml | 2 +- .github/workflows/test-integration.yml | 4 ++-- .github/workflows/test.yml | 8 ++++---- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/cypress-canary.yml b/.github/workflows/cypress-canary.yml index a2c51e7c7b..fa6e40dab0 100644 --- a/.github/workflows/cypress-canary.yml +++ b/.github/workflows/cypress-canary.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Generate Github token uses: navikt/github-app-token-generator@v1 @@ -25,7 +25,7 @@ jobs: app-id: ${{ secrets.TOKENS_APP_ID }} - name: Checkout @netlify/wait-for-deploy-action - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: netlify/wait-for-deploy-action token: ${{ steps.get-token.outputs.token }} @@ -43,7 +43,7 @@ jobs: run: echo ${{ steps.deploy.outputs.origin-url }} - name: Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: '16' diff --git a/.github/workflows/cypress-demo-nx.yml b/.github/workflows/cypress-demo-nx.yml index f9c9b3817a..d93334a841 100644 --- a/.github/workflows/cypress-demo-nx.yml +++ b/.github/workflows/cypress-demo-nx.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Generate Github token uses: navikt/github-app-token-generator@v1 @@ -25,7 +25,7 @@ jobs: app-id: ${{ secrets.TOKENS_APP_ID }} - name: Checkout @netlify/wait-for-deploy-action - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: netlify/wait-for-deploy-action token: ${{ steps.get-token.outputs.token }} @@ -43,7 +43,7 @@ jobs: run: echo ${{ steps.deploy.outputs.origin-url }} - name: Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: '16' diff --git a/.github/workflows/cypress-demo-static.yml b/.github/workflows/cypress-demo-static.yml index 09ae003300..697331d77a 100644 --- a/.github/workflows/cypress-demo-static.yml +++ b/.github/workflows/cypress-demo-static.yml @@ -19,7 +19,7 @@ jobs: containers: [1, 2] steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Generate Github token uses: navikt/github-app-token-generator@v1 @@ -29,7 +29,7 @@ jobs: app-id: ${{ secrets.TOKENS_APP_ID }} - name: Checkout @netlify/wait-for-deploy-action - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: netlify/wait-for-deploy-action token: ${{ steps.get-token.outputs.token }} @@ -47,7 +47,7 @@ jobs: run: echo ${{ steps.deploy.outputs.origin-url }} - name: Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: '16' diff --git a/.github/workflows/cypress-demo.yml b/.github/workflows/cypress-demo.yml index b04a880101..0093eb1761 100644 --- a/.github/workflows/cypress-demo.yml +++ b/.github/workflows/cypress-demo.yml @@ -19,7 +19,7 @@ jobs: containers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Generate Github token uses: navikt/github-app-token-generator@v1 @@ -29,7 +29,7 @@ jobs: app-id: ${{ secrets.TOKENS_APP_ID }} - name: Checkout @netlify/wait-for-deploy-action - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: netlify/wait-for-deploy-action token: ${{ steps.get-token.outputs.token }} @@ -47,7 +47,7 @@ jobs: run: echo ${{ steps.deploy.outputs.origin-url }} - name: Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: '16' diff --git a/.github/workflows/cypress-middleware.yml b/.github/workflows/cypress-middleware.yml index a2152df7b9..8223e75e9b 100644 --- a/.github/workflows/cypress-middleware.yml +++ b/.github/workflows/cypress-middleware.yml @@ -19,7 +19,7 @@ jobs: containers: [1, 2] steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Generate Github token uses: navikt/github-app-token-generator@v1 @@ -29,7 +29,7 @@ jobs: app-id: ${{ secrets.TOKENS_APP_ID }} - name: Checkout @netlify/wait-for-deploy-action - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: netlify/wait-for-deploy-action token: ${{ steps.get-token.outputs.token }} @@ -47,7 +47,7 @@ jobs: run: echo ${{ steps.deploy.outputs.origin-url }} - name: Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: '16' diff --git a/.github/workflows/e2e-appdir.yml b/.github/workflows/e2e-appdir.yml index 5f9f1d2ca1..418740cc10 100644 --- a/.github/workflows/e2e-appdir.yml +++ b/.github/workflows/e2e-appdir.yml @@ -35,7 +35,7 @@ jobs: test-file: ${{ fromJson(needs.setup.outputs['test-files']) }} steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: '16' cache: 'npm' diff --git a/.github/workflows/e2e-next.yml b/.github/workflows/e2e-next.yml index ce3c89519b..0b4f5e12f6 100644 --- a/.github/workflows/e2e-next.yml +++ b/.github/workflows/e2e-next.yml @@ -37,7 +37,7 @@ jobs: test-file: ${{ fromJson(needs.setup.outputs['test-files']) }} steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: '16' cache: 'npm' diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index d8c3a0e308..3333747124 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -8,8 +8,8 @@ jobs: prerelease: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 with: node-version: 'lts/*' cache: 'npm' diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 2437085358..d3ba9e8543 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -17,9 +17,9 @@ jobs: with: token: ${{ steps.get-token.outputs.token }} command: manifest - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 if: ${{ steps.release.outputs.releases_created }} - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: 'lts/*' cache: 'npm' diff --git a/.github/workflows/test-deno.yml b/.github/workflows/test-deno.yml index 6c15856206..14b2392291 100644 --- a/.github/workflows/test-deno.yml +++ b/.github/workflows/test-deno.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Git Checkout Deno Module - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Use Deno Version ${{ matrix.deno-version }} uses: denolib/setup-deno@v2 with: diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index 001c8369b3..71866c0492 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -15,9 +15,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Installing with LTS Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: 18 check-latest: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ef62864dd5..39e37f242d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,9 +22,9 @@ jobs: fail-fast: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Installing with LTS Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: 16 check-latest: true @@ -45,9 +45,9 @@ jobs: if: github.ref_name == 'main' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Installing with LTS Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: 16 check-latest: true