Merge branch 'master' into master

pingcap · Mar 24, 2022 · 0a726f6 · 0a726f6
2 parents 2046db2 + 6d01855
commit 0a726f6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/br_compatible_test.yml b/.github/workflows/br_compatible_test.yml
@@ -46,7 +46,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.18
 
     - name: Generate compatibility test backup data
       timeout-minutes: 15

diff --git a/.github/workflows/compile_br.yaml b/.github/workflows/compile_br.yaml
@@ -48,7 +48,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.18
 
       - name: Run build
         run: make build_tools
@@ -73,7 +73,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.18
 
       - name: Run build
         run: make build_tools
@@ -88,7 +88,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.18
 
       - name: Compile for FreeBSD
         run: GOOS=freebsd make build_tools
diff --git a/.github/workflows/dumpling_integration_test.yml b/.github/workflows/dumpling_integration_test.yml
@@ -50,10 +50,10 @@ jobs:
       - uses: actions/checkout@v2
       - name: Shutdown Ubuntu MySQL (SUDO)
         run: sudo service mysql stop # Shutdown the Default MySQL, "sudo" is necessary, please not remove it
-      - name: Set up Go 1.16
+      - name: Set up Go 1.18
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.18
       - uses: actions/cache@v2
         with:
           path: ~/go/pkg/mod
@@ -87,10 +87,10 @@ jobs:
       - uses: actions/checkout@v2
       - name: Shutdown Ubuntu MySQL (SUDO)
         run: sudo service mysql stop # Shutdown the Default MySQL, "sudo" is necessary, please not remove it
-      - name: Set up Go 1.16
+      - name: Set up Go 1.18
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.18
       - uses: actions/cache@v2
         with:
           path: ~/go/pkg/mod
@@ -124,10 +124,10 @@ jobs:
       - uses: actions/checkout@v2
       - name: Shutdown Ubuntu MySQL (SUDO)
         run: sudo service mysql stop # Shutdown the Default MySQL, "sudo" is necessary, please not remove it
-      - name: Set up Go 1.16
+      - name: Set up Go 1.18
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.18
       - uses: actions/cache@v2
         with:
           path: ~/go/pkg/mod