From 25bf298343456147a61ecb7d2d6bb5346f30de5c Mon Sep 17 00:00:00 2001 From: Carly Gundy <47304080+cgundy@users.noreply.github.com> Date: Wed, 19 Jun 2024 18:41:29 +0200 Subject: [PATCH 1/5] chore(IDX): move back to dind runners (#246) Co-authored-by: IDX GitHub Automation --- .github/workflows-source/ci-pr-only.yml | 9 +++++---- .github/workflows/ci-pr-only.yml | 8 ++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows-source/ci-pr-only.yml b/.github/workflows-source/ci-pr-only.yml index 24c50938d8ee..0d7885b94980 100644 --- a/.github/workflows-source/ci-pr-only.yml +++ b/.github/workflows-source/ci-pr-only.yml @@ -21,9 +21,9 @@ env: anchors: image: &image image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2 - bazel-small-setup: &bazel-small-setup + dind-small-setup: &dind-small-setup runs-on: - labels: bazel-runner-small + labels: dind-runner-small container: <<: *image timeout-minutes: 30 @@ -71,9 +71,10 @@ jobs: lock-generate: name: Lock Generate - <<: *bazel-small-setup + <<: *dind-small-setup steps: - <<: *checkout + - <<: *before-script - name: Filter Relevant Files uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3 id: filter @@ -95,7 +96,7 @@ jobs: pre-commit: name: Pre Commit Test - <<: *bazel-small-setup + <<: *dind-small-setup steps: - <<: *checkout with: diff --git a/.github/workflows/ci-pr-only.yml b/.github/workflows/ci-pr-only.yml index bb00b247fddb..626fbb37174f 100644 --- a/.github/workflows/ci-pr-only.yml +++ b/.github/workflows/ci-pr-only.yml @@ -51,7 +51,7 @@ jobs: lock-generate: name: Lock Generate runs-on: - labels: bazel-runner-small + labels: dind-runner-small container: image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2 timeout-minutes: 30 @@ -59,6 +59,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - name: Before script + id: before-script + shell: bash + run: ./gitlab-ci/src/ci-scripts/before-script.sh - name: Filter Relevant Files uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3 id: filter @@ -80,7 +84,7 @@ jobs: pre-commit: name: Pre Commit Test runs-on: - labels: bazel-runner-small + labels: dind-runner-small container: image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2 timeout-minutes: 30 From 2267b7703c8064a7b92c96d1ef2d98cebc96fa83 Mon Sep 17 00:00:00 2001 From: Marko Kosmerl Date: Wed, 19 Jun 2024 17:05:13 +0000 Subject: [PATCH 2/5] chore(IDX): actions/setup-python@v5 --- .github/workflows-source/ci-pr-only.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows-source/ci-pr-only.yml b/.github/workflows-source/ci-pr-only.yml index 0d7885b94980..1fe110d35336 100644 --- a/.github/workflows-source/ci-pr-only.yml +++ b/.github/workflows-source/ci-pr-only.yml @@ -113,7 +113,7 @@ jobs: steps: - <<: *checkout - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: '3.10' - name: Run script From 8111a8ee5d91ed0cf9c821e9c87b5d4041aa7add Mon Sep 17 00:00:00 2001 From: IDX GitHub Automation Date: Wed, 19 Jun 2024 17:05:51 +0000 Subject: [PATCH 3/5] IDX GitHub Automation --- .github/workflows/ci-pr-only.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-pr-only.yml b/.github/workflows/ci-pr-only.yml index 626fbb37174f..36cd61b6d3ac 100644 --- a/.github/workflows/ci-pr-only.yml +++ b/.github/workflows/ci-pr-only.yml @@ -106,7 +106,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: '3.10' - name: Run script From b5daa8a0b030e7ea70ba83a24cb501c1583f03dd Mon Sep 17 00:00:00 2001 From: Marko Kosmerl Date: Wed, 19 Jun 2024 17:46:43 +0000 Subject: [PATCH 4/5] change --- .github/workflows-source/ci-main.yml | 2 +- .github/workflows/ci-generate-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows-source/ci-main.yml b/.github/workflows-source/ci-main.yml index cbcfd7da8f04..3e08e3e83c9b 100644 --- a/.github/workflows-source/ci-main.yml +++ b/.github/workflows-source/ci-main.yml @@ -56,7 +56,7 @@ anchors: fetch-depth: ${{ github.event_name == 'pull_request' && 256 || 0 }} python-setup: &python-setup name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: '3.10' diff --git a/.github/workflows/ci-generate-ci.yml b/.github/workflows/ci-generate-ci.yml index 412fb6d2d9eb..18807b74e053 100644 --- a/.github/workflows/ci-generate-ci.yml +++ b/.github/workflows/ci-generate-ci.yml @@ -20,7 +20,7 @@ jobs: ref: ${{ github.event.pull_request.head.ref }} token: ${{ secrets.IDX_PUSH_TO_PR }} - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: '3.10' - name: Run Generate CI From bce378fe83758ecfbfdb314d1500cc7ba15d4ed5 Mon Sep 17 00:00:00 2001 From: IDX GitHub Automation Date: Wed, 19 Jun 2024 17:47:03 +0000 Subject: [PATCH 5/5] IDX GitHub Automation --- .github/workflows/ci-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index 7003d27851dd..c92159d4845d 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -208,7 +208,7 @@ jobs: with: fetch-depth: ${{ github.event_name == 'pull_request' && 256 || 0 }} - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: '3.10' - name: Run Python CI Tests