Merge branch 'master' into prune_pd_info

pingcap · Nov 15, 2023 · 2840f40 · 2840f40
2 parents 786e033 + 520c05a
commit 2840f40
Show file tree

Hide file tree

Showing 218 changed files with 5,329 additions and 3,749 deletions.
diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml
@@ -16,7 +16,7 @@ on:
 jobs:
   install:
     name: Install
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     env:
       working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
     steps:
@@ -41,10 +41,10 @@ jobs:
     env:
       working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
     steps:
-      - name: Set up Go 1.19
-        uses: actions/setup-go@v2
+      - name: Set up Go 1.21
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
         id: go
 
       - name: Check out code into the Go module directory

diff --git a/.github/workflows/integrate-cluster-cmd.yaml b/.github/workflows/integrate-cluster-cmd.yaml
@@ -30,7 +30,7 @@ on:
 
 jobs:
   cluster:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: true
       matrix:
@@ -43,10 +43,10 @@ jobs:
     env:
       working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
     steps:
-      - name: Set up Go 1.19
-        uses: actions/setup-go@v2
+      - name: Set up Go 1.21
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
         id: go
 
       - name: Check out code into the Go module directory

diff --git a/.github/workflows/integrate-cluster-scale.yaml b/.github/workflows/integrate-cluster-scale.yaml
@@ -30,7 +30,7 @@ on:
 
 jobs:
   cluster:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: true
       matrix:
@@ -42,10 +42,10 @@ jobs:
     env:
       working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
     steps:
-      - name: Set up Go 1.19
-        uses: actions/setup-go@v2
+      - name: Set up Go 1.21
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
         id: go
 
       - name: Check out code into the Go module directory

diff --git a/.github/workflows/integrate-dm.yaml b/.github/workflows/integrate-dm.yaml
@@ -30,7 +30,7 @@ on:
 
 jobs:
   dm:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: true
       matrix:
@@ -42,10 +42,10 @@ jobs:
     env:
       working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
     steps:
-      - name: Set up Go 1.19
-        uses: actions/setup-go@v2
+      - name: Set up Go 1.21
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
         id: go
 
       - name: Check out code into the Go module directory

diff --git a/.github/workflows/integrate-playground.yaml b/.github/workflows/integrate-playground.yaml
@@ -31,7 +31,7 @@ on:
 
 jobs:
   playground:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     timeout-minutes: 10
     strategy:
       fail-fast: true
@@ -41,10 +41,10 @@ jobs:
     env:
       working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
     steps:
-      - name: Set up Go 1.19
-        uses: actions/setup-go@v2
+      - name: Set up Go 1.21
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
         id: go
 
       - name: Check out code into the Go module directory

diff --git a/.github/workflows/integrate-tiup.yaml b/.github/workflows/integrate-tiup.yaml
@@ -35,7 +35,7 @@ on:
 
 jobs:
   tiup:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     timeout-minutes: 10
     strategy:
       fail-fast: true
@@ -45,10 +45,10 @@ jobs:
     env:
       working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
     steps:
-      - name: Set up Go 1.19
-        uses: actions/setup-go@v2
+      - name: Set up Go 1.21
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
         id: go
 
       - name: Check out code into the Go module directory
@@ -90,10 +90,10 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           path: go/src/github.com/${{ github.repository }}
 
-      - name: Set up Go 1.19
-        uses: actions/setup-go@v2
+      - name: Set up Go 1.21
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
         id: go
 
       - name: make unit-test

diff --git a/.github/workflows/release-tiup.yaml b/.github/workflows/release-tiup.yaml
@@ -6,6 +6,7 @@ on:
     branches:
       - ci/gh-*
       - release-*
+      - master
     paths-ignore:
       - '**.html'
       - '**.md'
@@ -24,7 +25,7 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     timeout-minutes: 30
     outputs:
       REL_VER: ${{ steps.build_tiup.outputs.REL_VER }}
@@ -40,10 +41,10 @@ jobs:
     env:
       working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
     steps:
-      - name: Set up Go 1.19
-        uses: actions/setup-go@v2
+      - name: Set up Go 1.21
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
         id: go
 
       - name: Check out code into the Go module directory
@@ -58,7 +59,7 @@ jobs:
         working-directory: ${{ env.working-directory }}
         if: github.event_name != 'release'
         run: |
-          STAGING_VER=`git describe --tags | sed -r "s/([^-]*-g)/r\1/"`
+          STAGING_VER=`git describe --tags | sed 's/-[^-]*$//' | sed -r 's/(-[^-]*$)/-nightly\1/'`
           echo ::set-output name=STAGING::$STAGING_VER
 
       - name: Get git ref and commit
@@ -90,7 +91,7 @@ jobs:
 
           if [ ! -z ${{ steps.check_staging.outputs.STAGING }} ]; then
             export EXTRA_LDFLAGS="-X \"github.com/${{ github.repository }}/pkg/version.TiUPVerName=${{ steps.check_staging.outputs.STAGING }}\""
-            export REL_VER=${{ steps.check_staging.outputs.STAGING }}+staging
+            export REL_VER=${{ steps.check_staging.outputs.STAGING }}
           else
             export REL_VER=`git describe --tags --always`
           fi
@@ -147,7 +148,7 @@ jobs:
       - name: Publish packages
         working-directory: ${{ env.working-directory }}
         env:
-          TIUP_MIRRORS: ${{ secrets.TIUP_SERVER_STAGING }}
+          TIUP_MIRRORS: ${{ secrets.TIUP_SERVER_PROD }}
           TIUP_HOME: ${{ steps.packaging.outputs.TIUP_HOME }}
           TIUP_BIN: ${{ steps.packaging.outputs.TIUP_BIN }}
           REL_VER: ${{ steps.build_tiup.outputs.REL_VER }}
@@ -159,20 +160,10 @@ jobs:
           client_desc: "Client to connect playground"
           server_desc: "TiUP publish/cache server"
         run: |
-          if [ ! -z ${{ steps.check_staging.outputs.STAGING }} ]; then
-            TIUP_MIRRORS=${{ secrets.TIUP_SERVER_STAGING }}
-          else
-            TIUP_MIRRORS=${{ secrets.TIUP_SERVER_PROD }}
-          fi
           ${TIUP_BIN} mirror set ${TIUP_MIRRORS}
 
           echo ${{ secrets.TIUP_COMP_KEY_PINGCAP }} | base64 -d > $TIUP_HOME/keys/private.json
 
-          # build the latest tiup to use for publish, this is a workaround and should
-          # be removed after this PR is merged and released
-          GOOS=linux GOARCH=amd64 make tiup
-          cp bin/tiup ${TIUP_BIN}
-
           # add a random delay before actually publishing, this can help reduce manifest conflict
           # when there are multiple jobs running in parallel
           sleep $[ ( $RANDOM % 10 ) ]s

diff --git a/.github/workflows/reprotest.yaml b/.github/workflows/reprotest.yaml
@@ -30,19 +30,19 @@ on:
 jobs:
   reprotest:
     # The type of runner that the job will run on
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     strategy:
       matrix:
         go:
-          - 1.19.x
+          - 1.21.x
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - uses: actions/checkout@v3
 
       - name: Set up Go ${{ matrix.go }}
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go }}