From b583e46f741fd2fbb38478b949def2e2eb9834f4 Mon Sep 17 00:00:00 2001 From: husharp Date: Tue, 16 Apr 2024 10:54:17 +0800 Subject: [PATCH 1/3] bump action Signed-off-by: husharp --- .github/workflows/check.yaml | 6 +++--- .github/workflows/pd-docker-image.yaml | 4 ++-- .github/workflows/pd-tests.yaml | 8 ++++---- .github/workflows/tso-consistency-test.yaml | 4 ++-- .github/workflows/tso-function-test.yaml | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index e2bf99c026f..21d4f05ef53 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -8,13 +8,13 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 20 steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v5 with: go-version: '1.21' - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Restore cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/pkg/mod diff --git a/.github/workflows/pd-docker-image.yaml b/.github/workflows/pd-docker-image.yaml index 2a04c030016..2463ffa2641 100644 --- a/.github/workflows/pd-docker-image.yaml +++ b/.github/workflows/pd-docker-image.yaml @@ -15,10 +15,10 @@ jobs: strategy: fail-fast: true steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v5 with: go-version: '1.21' - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Make run: make docker-image diff --git a/.github/workflows/pd-tests.yaml b/.github/workflows/pd-tests.yaml index 3674e41cf8a..c4191014821 100644 --- a/.github/workflows/pd-tests.yaml +++ b/.github/workflows/pd-tests.yaml @@ -29,13 +29,13 @@ jobs: outputs: job-total: 13 steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v5 with: go-version: '1.21' - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Restore cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/pkg/mod @@ -62,7 +62,7 @@ jobs: 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 with: diff --git a/.github/workflows/tso-consistency-test.yaml b/.github/workflows/tso-consistency-test.yaml index 570cbbc5da8..b3c99c0458f 100644 --- a/.github/workflows/tso-consistency-test.yaml +++ b/.github/workflows/tso-consistency-test.yaml @@ -8,10 +8,10 @@ jobs: tso-consistency-test: runs-on: ubuntu-latest steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v5 with: go-version: '1.21' - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - 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 d7780425d30..5c673674b7d 100644 --- a/.github/workflows/tso-function-test.yaml +++ b/.github/workflows/tso-function-test.yaml @@ -21,10 +21,10 @@ jobs: tso-function-test: runs-on: ubuntu-latest steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v5 with: go-version: '1.21' - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Make TSO Function Test run: make test-tso-function From 74c35e693ebb739a003a09d99016cb610a040ddf Mon Sep 17 00:00:00 2001 From: husharp Date: Tue, 16 Apr 2024 11:02:31 +0800 Subject: [PATCH 2/3] bump action Signed-off-by: husharp --- .github/workflows/label.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: | From 3b947e531cadf5bf1ad3fdd13c778e54095f1472 Mon Sep 17 00:00:00 2001 From: husharp Date: Tue, 16 Apr 2024 13:20:03 +0800 Subject: [PATCH 3/3] fix cache Signed-off-by: husharp --- .github/workflows/check.yaml | 14 ++----------- .github/workflows/pd-docker-image.yaml | 4 ++-- .github/workflows/pd-tests.yaml | 22 +++++++-------------- .github/workflows/tso-consistency-test.yaml | 4 ++-- .github/workflows/tso-function-test.yaml | 4 ++-- 5 files changed, 15 insertions(+), 33 deletions(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 21d4f05ef53..3ccb2635e9f 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -8,21 +8,11 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 20 steps: - - uses: actions/setup-go@v5 - with: - go-version: '1.21' - name: Checkout code uses: actions/checkout@v4 - - name: Restore cache - uses: actions/cache@v4 + - uses: actions/setup-go@v5 with: - path: | - ~/go/pkg/mod - ~/.cache/go-build - **/.dashboard_download_cache - key: ${{ runner.os }}-golang-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-golang + go-version: '1.21' - name: Make Check run: | SWAGGER=1 make build diff --git a/.github/workflows/pd-docker-image.yaml b/.github/workflows/pd-docker-image.yaml index 2463ffa2641..5beaa66c156 100644 --- a/.github/workflows/pd-docker-image.yaml +++ b/.github/workflows/pd-docker-image.yaml @@ -15,10 +15,10 @@ jobs: strategy: fail-fast: true steps: + - name: Checkout code + uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: go-version: '1.21' - - name: Checkout code - uses: actions/checkout@v4 - name: Make run: make docker-image diff --git a/.github/workflows/pd-tests.yaml b/.github/workflows/pd-tests.yaml index c4191014821..418b019c7b0 100644 --- a/.github/workflows/pd-tests.yaml +++ b/.github/workflows/pd-tests.yaml @@ -29,20 +29,11 @@ jobs: outputs: job-total: 13 steps: - - uses: actions/setup-go@v5 - with: - go-version: '1.21' - name: Checkout code uses: actions/checkout@v4 - - name: Restore cache - uses: actions/cache@v4 + - uses: actions/setup-go@v5 with: - path: | - ~/go/pkg/mod - ~/.cache/go-build - **/.tools - **/.dashboard_download_cache - key: ${{ runner.os }}-go-${{ matrix.worker_id }}-${{ hashFiles('**/go.sum') }} + go-version: '1.21' - name: Make Test env: WORKER_ID: ${{ matrix.worker_id }} @@ -53,9 +44,9 @@ 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 @@ -64,9 +55,10 @@ jobs: - name: Checkout code 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 b3c99c0458f..3cb24898a10 100644 --- a/.github/workflows/tso-consistency-test.yaml +++ b/.github/workflows/tso-consistency-test.yaml @@ -8,10 +8,10 @@ jobs: tso-consistency-test: runs-on: ubuntu-latest steps: + - name: Checkout code + uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: go-version: '1.21' - - name: Checkout code - uses: actions/checkout@v4 - 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 5c673674b7d..13fd6fe7df6 100644 --- a/.github/workflows/tso-function-test.yaml +++ b/.github/workflows/tso-function-test.yaml @@ -21,10 +21,10 @@ jobs: tso-function-test: runs-on: ubuntu-latest steps: + - name: Checkout code + uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: go-version: '1.21' - - name: Checkout code - uses: actions/checkout@v4 - name: Make TSO Function Test run: make test-tso-function