From 4fe32afb01d0dc297164870473953e07b40e79c9 Mon Sep 17 00:00:00 2001 From: Hu# Date: Tue, 16 Apr 2024 18:03:06 +0800 Subject: [PATCH] This is an automated cherry-pick of #8071 close tikv/pd#8070 Signed-off-by: ti-chi-bot --- .github/workflows/check.yaml | 8 +++++++- .github/workflows/label.yaml | 2 +- .github/workflows/pd-docker-image.yaml | 8 +++++++- .github/workflows/pd-tests.yaml | 19 +++++++++++++------ .github/workflows/tso-consistency-test.yaml | 8 +++++++- .github/workflows/tso-function-test.yaml | 8 +++++++- 6 files changed, 42 insertions(+), 11 deletions(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 65f4fbf3349a..4ab20c81cf78 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -8,8 +8,11 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 10 steps: - - uses: actions/setup-go@v3 + - name: Checkout code + uses: actions/checkout@v4 + - uses: actions/setup-go@v5 with: +<<<<<<< HEAD go-version: 1.19 - name: Checkout code uses: actions/checkout@v3 @@ -23,6 +26,9 @@ jobs: key: ${{ runner.os }}-golang-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-golang +======= + go-version: '1.21' +>>>>>>> acbb9afaa (ci: transitioning action version from node 16 to node 20 (#8071)) - name: Make Check run: | make build diff --git a/.github/workflows/label.yaml b/.github/workflows/label.yaml index 5ff2b895528e..00438d26b63f 100644 --- a/.github/workflows/label.yaml +++ b/.github/workflows/label.yaml @@ -7,7 +7,7 @@ jobs: add_labels: runs-on: ubuntu-latest steps: - - uses: actions/github-script@v4 + - uses: actions/github-script@v7 name: Add labels with: script: | diff --git a/.github/workflows/pd-docker-image.yaml b/.github/workflows/pd-docker-image.yaml index 9de4c4f473e8..d0568d77bb10 100644 --- a/.github/workflows/pd-docker-image.yaml +++ b/.github/workflows/pd-docker-image.yaml @@ -15,10 +15,16 @@ jobs: strategy: fail-fast: true steps: - - uses: actions/setup-go@v3 + - name: Checkout code + uses: actions/checkout@v4 + - uses: actions/setup-go@v5 with: +<<<<<<< HEAD go-version: 1.19 - name: Checkout code uses: actions/checkout@v3 +======= + go-version: '1.21' +>>>>>>> acbb9afaa (ci: transitioning action version from node 16 to node 20 (#8071)) - name: Make run: make docker-image diff --git a/.github/workflows/pd-tests.yaml b/.github/workflows/pd-tests.yaml index 8eab95c4326a..4770abea8daa 100644 --- a/.github/workflows/pd-tests.yaml +++ b/.github/workflows/pd-tests.yaml @@ -25,8 +25,11 @@ jobs: outputs: job-total: 10 steps: - - uses: actions/setup-go@v3 + - name: Checkout code + uses: actions/checkout@v4 + - uses: actions/setup-go@v5 with: +<<<<<<< HEAD go-version: "1.19" - name: Checkout code uses: actions/checkout@v3 @@ -39,6 +42,9 @@ jobs: **/.tools **/.dashboard_download_cache key: ${{ runner.os }}-go-${{ matrix.worker_id }}-${{ hashFiles('**/go.sum') }} +======= + go-version: '1.21' +>>>>>>> acbb9afaa (ci: transitioning action version from node 16 to node 20 (#8071)) - name: Make Test env: WORKER_ID: ${{ matrix.worker_id }} @@ -49,20 +55,21 @@ jobs: mv covprofile covprofile_$WORKER_ID sed -i "/failpoint_binding/d" covprofile_$WORKER_ID - name: Upload coverage result ${{ matrix.worker_id }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: - name: cover-reports + name: cover-reports-${{ matrix.worker_id }} path: covprofile_${{ matrix.worker_id }} report-coverage: needs: chunks runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download chunk report - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: - name: cover-reports + pattern: cover-reports-* + merge-multiple: true - name: Merge env: TOTAL_JOBS: ${{needs.chunks.outputs.job-total}} diff --git a/.github/workflows/tso-consistency-test.yaml b/.github/workflows/tso-consistency-test.yaml index d5fb6d05775a..51b84d65b296 100644 --- a/.github/workflows/tso-consistency-test.yaml +++ b/.github/workflows/tso-consistency-test.yaml @@ -8,10 +8,16 @@ jobs: tso-consistency-test: runs-on: ubuntu-latest steps: - - uses: actions/setup-go@v3 + - name: Checkout code + uses: actions/checkout@v4 + - uses: actions/setup-go@v5 with: +<<<<<<< HEAD go-version: "1.19" - name: Checkout code uses: actions/checkout@v3 +======= + go-version: '1.21' +>>>>>>> acbb9afaa (ci: transitioning action version from node 16 to node 20 (#8071)) - name: Make TSO Consistency Test run: make test-tso-consistency diff --git a/.github/workflows/tso-function-test.yaml b/.github/workflows/tso-function-test.yaml index 2514e55be0a8..1ee79c9ec2d5 100644 --- a/.github/workflows/tso-function-test.yaml +++ b/.github/workflows/tso-function-test.yaml @@ -17,10 +17,16 @@ jobs: tso-function-test: runs-on: ubuntu-latest steps: - - uses: actions/setup-go@v3 + - name: Checkout code + uses: actions/checkout@v4 + - uses: actions/setup-go@v5 with: +<<<<<<< HEAD go-version: "1.19" - name: Checkout code uses: actions/checkout@v3 +======= + go-version: '1.21' +>>>>>>> acbb9afaa (ci: transitioning action version from node 16 to node 20 (#8071)) - name: Make TSO Function Test run: make test-tso-function