From 4ba750959a7ba2b3d231ace16b40cd8c982ed058 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 4 May 2023 19:34:24 +0200 Subject: [PATCH 1/9] Upgrade to Node 20 on CI --- .drone.yml | 8 ++++---- .github/workflows/pull-compliance.yml | 4 ++-- .github/workflows/pull-compliance_docs.yml | 2 +- .github/workflows/pull-e2e.yml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7810d3d10444..4e7789ef9233 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,7 +33,7 @@ steps: - git fetch --tags --force - name: deps-frontend - image: node:18 + image: node:20 pull: always commands: - make deps-frontend @@ -51,7 +51,7 @@ steps: image: techknowlogick/xgo:go-1.20.x pull: always commands: - # Upgrade to node 18 once https://github.com/techknowlogick/xgo/issues/163 is resolved + # Upgrade to node 20 once https://github.com/techknowlogick/xgo/issues/163 is resolved - curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get -qqy install nodejs - export PATH=$PATH:$GOPATH/bin - make release @@ -161,7 +161,7 @@ steps: - git fetch --tags --force - name: deps-frontend - image: node:18 + image: node:20 pull: always commands: - make deps-frontend @@ -179,7 +179,7 @@ steps: image: techknowlogick/xgo:go-1.20.x pull: always commands: - # Upgrade to node 18 once https://github.com/techknowlogick/xgo/issues/163 is resolved + # Upgrade to node 20 once https://github.com/techknowlogick/xgo/issues/163 is resolved - curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get -qqy install nodejs - export PATH=$PATH:$GOPATH/bin - make release diff --git a/.github/workflows/pull-compliance.yml b/.github/workflows/pull-compliance.yml index 1239b9caa7bf..9989b3b565e8 100644 --- a/.github/workflows/pull-compliance.yml +++ b/.github/workflows/pull-compliance.yml @@ -79,7 +79,7 @@ jobs: - name: setup node uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 20 - name: deps-frontend run: make deps-frontend - name: lint frontend @@ -100,7 +100,7 @@ jobs: - name: setup node uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 20 - name: deps-backend run: make deps-backend deps-tools - name: deps-frontend diff --git a/.github/workflows/pull-compliance_docs.yml b/.github/workflows/pull-compliance_docs.yml index 679e925515e2..d4de3ea09dae 100644 --- a/.github/workflows/pull-compliance_docs.yml +++ b/.github/workflows/pull-compliance_docs.yml @@ -15,7 +15,7 @@ jobs: - name: setup node uses: actions/setup-node@v2 with: - node-version: 18 + node-version: 20 - name: install dependencies run: make deps-frontend - name: lint markdown diff --git a/.github/workflows/pull-e2e.yml b/.github/workflows/pull-e2e.yml index 2cd6bd0d6ac6..7fa47a32ba20 100644 --- a/.github/workflows/pull-e2e.yml +++ b/.github/workflows/pull-e2e.yml @@ -15,7 +15,7 @@ jobs: - name: setup node uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 20 - name: build run: make deps-frontend frontend deps-backend - name: Install playwright browsers From 666b919809277d17a96ebc60dfc0c398fd4a725f Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 4 May 2023 19:36:55 +0200 Subject: [PATCH 2/9] bump setup-node --- .github/workflows/pull-compliance_docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-compliance_docs.yml b/.github/workflows/pull-compliance_docs.yml index d4de3ea09dae..097820c333d1 100644 --- a/.github/workflows/pull-compliance_docs.yml +++ b/.github/workflows/pull-compliance_docs.yml @@ -13,7 +13,7 @@ jobs: - name: checkout uses: actions/checkout@v3 - name: setup node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: 20 - name: install dependencies From 29cd68d309d66a78ce98d4229f31451443038faa Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 4 May 2023 21:07:20 +0200 Subject: [PATCH 3/9] add concurrency groups to pull pipelines --- .github/workflows/pull-compliance.yml | 4 ++++ .github/workflows/pull-compliance_docs.yml | 4 ++++ .github/workflows/pull-db_test.yml | 4 ++++ .github/workflows/pull-docker_dryrun.yml | 4 ++++ .github/workflows/pull-e2e.yml | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/.github/workflows/pull-compliance.yml b/.github/workflows/pull-compliance.yml index 9989b3b565e8..a64fcf6b1ded 100644 --- a/.github/workflows/pull-compliance.yml +++ b/.github/workflows/pull-compliance.yml @@ -2,6 +2,10 @@ name: "Pull: Compliance Tests" on: [pull_request] +concurrency: + group: ${{ github.ref }} + cancel-in-progress: true + jobs: lint_basic: runs-on: ubuntu-latest diff --git a/.github/workflows/pull-compliance_docs.yml b/.github/workflows/pull-compliance_docs.yml index 097820c333d1..b7aab0fcc9ef 100644 --- a/.github/workflows/pull-compliance_docs.yml +++ b/.github/workflows/pull-compliance_docs.yml @@ -6,6 +6,10 @@ on: - "docs/**" - "*.md" +concurrency: + group: ${{ github.ref }} + cancel-in-progress: true + jobs: compliance-docs: runs-on: ubuntu-latest diff --git a/.github/workflows/pull-db_test.yml b/.github/workflows/pull-db_test.yml index 3cae4df03962..fce3121d4219 100644 --- a/.github/workflows/pull-db_test.yml +++ b/.github/workflows/pull-db_test.yml @@ -2,6 +2,10 @@ name: "Pull: Database Tests" on: [pull_request] +concurrency: + group: ${{ github.ref }} + cancel-in-progress: true + jobs: # PostgreSQL Tests db_pgsql_test: diff --git a/.github/workflows/pull-docker_dryrun.yml b/.github/workflows/pull-docker_dryrun.yml index 8e5acb3cee1b..9005d8f2a259 100644 --- a/.github/workflows/pull-docker_dryrun.yml +++ b/.github/workflows/pull-docker_dryrun.yml @@ -2,6 +2,10 @@ name: "Pull: Docker Dry Run" on: [pull_request] +concurrency: + group: ${{ github.ref }} + cancel-in-progress: true + jobs: docker_dryrun: runs-on: ubuntu-latest diff --git a/.github/workflows/pull-e2e.yml b/.github/workflows/pull-e2e.yml index 7fa47a32ba20..6c1931b8418c 100644 --- a/.github/workflows/pull-e2e.yml +++ b/.github/workflows/pull-e2e.yml @@ -2,6 +2,10 @@ name: "Pull: E2E Tests" on: [pull_request] +concurrency: + group: ${{ github.ref }} + cancel-in-progress: true + jobs: e2e_tests: runs-on: ubuntu-latest From aa094fb4d2fd79d5ff91be6182e2b2cdbefdf8ca Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 4 May 2023 21:09:07 +0200 Subject: [PATCH 4/9] restart ci From 9007137bd42a4cf25c3eb99ef86d76e87861844f Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 4 May 2023 21:09:29 +0200 Subject: [PATCH 5/9] restart ci From 60d728a72f05585543c9741a0c35a5a21f7c89a3 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 4 May 2023 22:16:36 +0200 Subject: [PATCH 6/9] try adding workflow to concurrency group --- .github/workflows/pull-compliance.yml | 2 +- .github/workflows/pull-compliance_docs.yml | 2 +- .github/workflows/pull-db_test.yml | 2 +- .github/workflows/pull-docker_dryrun.yml | 2 +- .github/workflows/pull-e2e.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pull-compliance.yml b/.github/workflows/pull-compliance.yml index a64fcf6b1ded..f4ecf2731317 100644 --- a/.github/workflows/pull-compliance.yml +++ b/.github/workflows/pull-compliance.yml @@ -3,7 +3,7 @@ name: "Pull: Compliance Tests" on: [pull_request] concurrency: - group: ${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: diff --git a/.github/workflows/pull-compliance_docs.yml b/.github/workflows/pull-compliance_docs.yml index b7aab0fcc9ef..2c3a373f532d 100644 --- a/.github/workflows/pull-compliance_docs.yml +++ b/.github/workflows/pull-compliance_docs.yml @@ -7,7 +7,7 @@ on: - "*.md" concurrency: - group: ${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: diff --git a/.github/workflows/pull-db_test.yml b/.github/workflows/pull-db_test.yml index fce3121d4219..ab29544acfa4 100644 --- a/.github/workflows/pull-db_test.yml +++ b/.github/workflows/pull-db_test.yml @@ -3,7 +3,7 @@ name: "Pull: Database Tests" on: [pull_request] concurrency: - group: ${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: diff --git a/.github/workflows/pull-docker_dryrun.yml b/.github/workflows/pull-docker_dryrun.yml index 9005d8f2a259..0c156e261cb4 100644 --- a/.github/workflows/pull-docker_dryrun.yml +++ b/.github/workflows/pull-docker_dryrun.yml @@ -3,7 +3,7 @@ name: "Pull: Docker Dry Run" on: [pull_request] concurrency: - group: ${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: diff --git a/.github/workflows/pull-e2e.yml b/.github/workflows/pull-e2e.yml index 6c1931b8418c..8857a643649f 100644 --- a/.github/workflows/pull-e2e.yml +++ b/.github/workflows/pull-e2e.yml @@ -3,7 +3,7 @@ name: "Pull: E2E Tests" on: [pull_request] concurrency: - group: ${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: From 83f474c0262303982ab57bc9e8295a61bcd9cfb0 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 4 May 2023 22:17:40 +0200 Subject: [PATCH 7/9] restart ci From 2e7c0ceafcc97ee7a1269a19fdc12a6df16fa80c Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 4 May 2023 22:46:03 +0200 Subject: [PATCH 8/9] add pull-request only cancelling --- .github/workflows/pull-compliance.yml | 2 +- .github/workflows/pull-compliance_docs.yml | 2 +- .github/workflows/pull-db_test.yml | 2 +- .github/workflows/pull-docker_dryrun.yml | 2 +- .github/workflows/pull-e2e.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pull-compliance.yml b/.github/workflows/pull-compliance.yml index f4ecf2731317..94ca850e80eb 100644 --- a/.github/workflows/pull-compliance.yml +++ b/.github/workflows/pull-compliance.yml @@ -3,7 +3,7 @@ name: "Pull: Compliance Tests" on: [pull_request] concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true jobs: diff --git a/.github/workflows/pull-compliance_docs.yml b/.github/workflows/pull-compliance_docs.yml index 2c3a373f532d..c033b62711df 100644 --- a/.github/workflows/pull-compliance_docs.yml +++ b/.github/workflows/pull-compliance_docs.yml @@ -7,7 +7,7 @@ on: - "*.md" concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true jobs: diff --git a/.github/workflows/pull-db_test.yml b/.github/workflows/pull-db_test.yml index ab29544acfa4..ce97bfcb2c0f 100644 --- a/.github/workflows/pull-db_test.yml +++ b/.github/workflows/pull-db_test.yml @@ -3,7 +3,7 @@ name: "Pull: Database Tests" on: [pull_request] concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true jobs: diff --git a/.github/workflows/pull-docker_dryrun.yml b/.github/workflows/pull-docker_dryrun.yml index 0c156e261cb4..f17d6014b606 100644 --- a/.github/workflows/pull-docker_dryrun.yml +++ b/.github/workflows/pull-docker_dryrun.yml @@ -3,7 +3,7 @@ name: "Pull: Docker Dry Run" on: [pull_request] concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true jobs: diff --git a/.github/workflows/pull-e2e.yml b/.github/workflows/pull-e2e.yml index 8857a643649f..37fc94fd96ce 100644 --- a/.github/workflows/pull-e2e.yml +++ b/.github/workflows/pull-e2e.yml @@ -3,7 +3,7 @@ name: "Pull: E2E Tests" on: [pull_request] concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true jobs: From 97dee6e9f73fc3538f381a1030d8713378051e3c Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 4 May 2023 23:49:36 +0200 Subject: [PATCH 9/9] restart ci