From 92a9dec17010130fbd54245dd28eb4d90701bd68 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 | 24 +++++++++++++++++++++ .github/workflows/pd-tests.yaml | 21 ++++++++++++++---- .github/workflows/tso-consistency-test.yaml | 8 +++++++ .github/workflows/tso-function-test.yaml | 8 +++++++ 6 files changed, 66 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/pd-docker-image.yaml diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index cfc113cfbd4..34115ef8f45 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -4,6 +4,7 @@ jobs: statics: runs-on: ubuntu-latest steps: +<<<<<<< HEAD - uses: actions/setup-go@v2 with: go-version: 1.16 @@ -20,6 +21,13 @@ jobs: key: ${{ runner.os }}-golang-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-golang +======= + - name: Checkout code + uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + 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 5ff2b895528..00438d26b63 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 new file mode 100644 index 00000000000..5beaa66c156 --- /dev/null +++ b/.github/workflows/pd-docker-image.yaml @@ -0,0 +1,24 @@ +name: PD Docker Image +on: + push: + branches: + - master + pull_request: + branches: + - master +concurrency: + group: ${{ github.ref }}-${{ github.workflow }} + cancel-in-progress: true +jobs: + chunks: + runs-on: ubuntu-latest + strategy: + fail-fast: true + steps: + - name: Checkout code + uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: '1.21' + - name: Make + run: make docker-image diff --git a/.github/workflows/pd-tests.yaml b/.github/workflows/pd-tests.yaml index c29a68ec11a..45a24da55cf 100644 --- a/.github/workflows/pd-tests.yaml +++ b/.github/workflows/pd-tests.yaml @@ -20,6 +20,7 @@ jobs: outputs: job-total: ${{ strategy.job-total }} steps: +<<<<<<< HEAD - uses: actions/setup-go@v2 with: go-version: 1.16 @@ -54,6 +55,13 @@ jobs: packages="{$(cat packages_unit_${WORKER_ID} |tr "\n" ",")}" echo "This worker will test the chunk - ${packages}" echo "::set-output name=list::${packages}" +======= + - name: Checkout code + uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + 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 }} @@ -62,20 +70,25 @@ 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 +<<<<<<< HEAD uses: actions/checkout@v2 +======= + uses: actions/checkout@v4 +>>>>>>> acbb9afaa (ci: transitioning action version from node 16 to node 20 (#8071)) - 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 a3e1de811df..cb32619f437 100644 --- a/.github/workflows/tso-consistency-test.yaml +++ b/.github/workflows/tso-consistency-test.yaml @@ -8,10 +8,18 @@ jobs: tso-consistency-test: runs-on: ubuntu-latest steps: +<<<<<<< HEAD - uses: actions/setup-go@v2 with: go-version: 1.16 - name: Checkout code uses: actions/checkout@v2 +======= + - name: Checkout code + uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + 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 fd8c14f88f6..dc73c86b3da 100644 --- a/.github/workflows/tso-function-test.yaml +++ b/.github/workflows/tso-function-test.yaml @@ -12,10 +12,18 @@ jobs: tso-function-test: runs-on: ubuntu-latest steps: +<<<<<<< HEAD - uses: actions/setup-go@v2 with: go-version: 1.16 - name: Checkout code uses: actions/checkout@v2 +======= + - name: Checkout code + uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + 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