From b37c7fb1488d3551985469fc78b20f8e95d5625d Mon Sep 17 00:00:00 2001 From: Mergify <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 15:48:04 +0000 Subject: [PATCH 1/3] ci(mergify): upgrade configuration to current format --- .mergify.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 107930132efe..2b2b478df3ae 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,21 +1,17 @@ queue_rules: - name: default - conditions: - - "#approved-reviews-by>1" - -pull_request_rules: - - name: automerge to main with label automerge and branch protection passing - conditions: + queue_conditions: - "#approved-reviews-by>1" - base=main - label=A:automerge - actions: - queue: - name: default - method: squash - commit_message_template: | - {{ title }} (#{{ number }}) - {{ body }} + merge_conditions: + - "#approved-reviews-by>1" + commit_message_template: | + {{ title }} (#{{ number }}) + {{ body }} + merge_method: squash + +pull_request_rules: - name: backport patches to v0.46.x branch conditions: - base=main @@ -48,3 +44,7 @@ pull_request_rules: backport: branches: - release/v0.42.x + - name: automerge to main with label automerge and branch protection passing + conditions: [] + actions: + queue: From b757f7ac56a13496139e70814b1b8f031e6a47ee Mon Sep 17 00:00:00 2001 From: Rootul Patel Date: Tue, 4 Feb 2025 11:13:39 -0500 Subject: [PATCH 2/3] fix: bump to actions v4 --- .github/workflows/test-race.yml | 8 ++++---- .github/workflows/test.yml | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test-race.yml b/.github/workflows/test-race.yml index 973b3b30f141..e72f4352e88a 100644 --- a/.github/workflows/test-race.yml +++ b/.github/workflows/test-race.yml @@ -64,19 +64,19 @@ jobs: - name: Split pkgs into 4 files run: split -d -n l/4 pkgs.txt pkgs.txt.part. # cache multiple - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: "${{ github.sha }}-00" path: ./pkgs.txt.part.00 - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: "${{ github.sha }}-01" path: ./pkgs.txt.part.01 - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: "${{ github.sha }}-02" path: ./pkgs.txt.part.02 - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: "${{ github.sha }}-03" path: ./pkgs.txt.part.03 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c421d05c427f..348ec4f64fe6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -58,7 +58,7 @@ jobs: # GIT_DIFF is passed to the scripts run: bash scripts/module-tests.sh if: env.GIT_DIFF - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: "${{ github.sha }}-go-submodules-coverage" path: ./coverage-go-submod-profile.out @@ -75,19 +75,19 @@ jobs: - name: Split pkgs into 4 files run: split -d -n l/4 pkgs.txt pkgs.txt.part. # cache multiple - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: "${{ github.sha }}-00" path: ./pkgs.txt.part.00 - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: "${{ github.sha }}-01" path: ./pkgs.txt.part.01 - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: "${{ github.sha }}-02" path: ./pkgs.txt.part.02 - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: "${{ github.sha }}-03" path: ./pkgs.txt.part.03 @@ -118,7 +118,7 @@ jobs: run: | cat pkgs.txt.part.${{ matrix.part }} | xargs go test -mod=readonly -timeout 30m -coverprofile=${{ matrix.part }}profile.out -covermode=atomic -tags='norace ledger test_ledger_mock' if: env.GIT_DIFF - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: "${{ github.sha }}-${{ matrix.part }}-coverage" path: ./${{ matrix.part }}profile.out From ac4a0687f55c22dc11af5b0cd629df71f83bc121 Mon Sep 17 00:00:00 2001 From: Rootul Patel Date: Tue, 4 Feb 2025 11:16:46 -0500 Subject: [PATCH 3/3] fix: bump to download artifact v4 --- .github/workflows/test-race.yml | 2 +- .github/workflows/test.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-race.yml b/.github/workflows/test-race.yml index e72f4352e88a..a445c462092d 100644 --- a/.github/workflows/test-race.yml +++ b/.github/workflows/test-race.yml @@ -99,7 +99,7 @@ jobs: **/**.go go.mod go.sum - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: "${{ github.sha }}-${{ matrix.part }}" if: env.GIT_DIFF diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 348ec4f64fe6..d7c01b72386e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -110,7 +110,7 @@ jobs: **/**.go go.mod go.sum - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: "${{ github.sha }}-${{ matrix.part }}" if: env.GIT_DIFF @@ -134,23 +134,23 @@ jobs: **/**.go go.mod go.sum - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: "${{ github.sha }}-00-coverage" if: env.GIT_DIFF - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: "${{ github.sha }}-01-coverage" if: env.GIT_DIFF - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: "${{ github.sha }}-02-coverage" if: env.GIT_DIFF - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: "${{ github.sha }}-03-coverage" if: env.GIT_DIFF - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: "${{ github.sha }}-go-submodules-coverage" if: env.GIT_DIFF