CI: upgrade go version to 1.21.5 (#13973)

also upgrade golangci-lint, but it report this error <img width="654" alt="image" src="https://github.com/matrixorigin/matrixone/assets/22561920/32394ad9-934a-478b-ab2b-24b0ad5ce807"> open issue: #13983 Approved by: @zhangxu19830126, @sukki37
matrixorigin · Jan 8, 2024 · 594ad8b · 594ad8b
1 parent f66efc0
commit 594ad8b
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 81 deletions.
diff --git a/.github/actions/setup_env/action.yaml b/.github/actions/setup_env/action.yaml
@@ -4,7 +4,11 @@ inputs:
   go-version:
     description: 'version of golang'
     required: false
-    default: "1.20"
+    default: "1.21.5"
+  cache:
+    description: 'wether use cache'
+    required: false
+    default: "false"
 
 runs:
   using: "composite"
@@ -14,16 +18,4 @@ runs:
       uses: actions/setup-go@v4
       with:
         go-version: ${{ inputs.go-version }} 
-        cache: true
-
-
-    # setup build-in cache: https://github.com/actions/setup-go#caching-dependency-files-and-build-outputs
-    # - uses: actions/cache@v3
-    #   name: Restore go mod cache
-    #   with:
-    #     path: |
-    #       ~/.cache/go-build
-    #       ~/go/pkg/mod
-    #     key: ${{ runner.os }}-go-mo-${{ hashFiles('**/go.sum') }}
-    #     restore-keys: |
-    #       ${{ runner.os }}-go-mo-
+        cache: ${{ inputs.cache }} 
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -86,9 +86,7 @@ jobs:
             .github/ISSUE_TEMPLATE/*.yml
             .github/ISSUE_TEMPLATE/*.yaml
       - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.20'          
+        uses: ./.github/actions/setup_env        
       - name: Prepare ENV
         run: |
           cd $GITHUB_WORKSPACE && make clean && make config && make build

diff --git a/.github/workflows/e2e-upgrade.yaml b/.github/workflows/e2e-upgrade.yaml
@@ -27,7 +27,7 @@ jobs:
           ref: ${{ github.event.pull_request.base.ref }}
 
       - name: Set up Go
-        uses: ./head/.github/actions/setup_env
+        uses: ./upstream/.github/actions/setup_env
 
       - name: Build MatrixOne for head
         run: |

diff --git a/.github/workflows/merge-trigger-standalone.yaml b/.github/workflows/merge-trigger-standalone.yaml
@@ -119,31 +119,12 @@ jobs:
         with:
           path: ./head
       - name: Set up Go
-        run: |
-          set +e;
-          GO_VERSION="1.20.9"
-          for i in {1..10}; do 
-            sudo bash -c "
-            set -ex;
-            rm -rf "go$GO_VERSION.linux-amd64.tar.gz";
-            rm -rf /usr/local/go;
-            wget "https://dl.google.com/go/go$GO_VERSION.linux-amd64.tar.gz" && tar -zxvf "go$GO_VERSION.linux-amd64.tar.gz" -C /usr/local/;
-            "
-            if [ "$?" -eq 0 ]; then
-              break;
-            fi
-
-            if [ "$i" -ge 10 ]; then
-              exit 1;
-            fi
-          done
-          echo "/usr/local/go/bin" >> $GITHUB_PATH
-          echo "$HOME/go/bin" >> $GITHUB_PATH
-          echo "GOROOT=/usr/local/go" >> $GITHUB_ENV
-          echo "GOPATH=$HOME/go" >> $GITHUB_ENV
-          echo "GOPROXY=https://goproxy.cn,direct" >> $GITHUB_ENV
+        uses: ./head/.github/actions/setup_env
+        with:
+          cache: "false"
       - name: Build MatrixOne
         run: |
+          export GOPROXY='https://goproxy.cn,direct'
           cd $GITHUB_WORKSPACE/head && make clean && make debug
           git rev-parse --short HEAD         
       - name: Start MO

diff --git a/.github/workflows/merge-trigger-tke.yaml b/.github/workflows/merge-trigger-tke.yaml
@@ -46,8 +46,8 @@ jobs:
 
           # add tencentyun docker image mirror and tencentyun apt mirror
           sed -i 's#^RUN apt-get update#RUN sed -i "s?http.*ubuntu\.com?http://mirrors\.tencentyun\.com?g" /etc/apt/sources.list  \&\& apt-get clean all \&\& apt-get update#g' optools/images/Dockerfile
-          sed -i 's#FROM golang:1.20.7-bookworm as builder#FROM ccr.ccs.tencentyun.com/cicd-runner/golang:1.20.7-bookworm as builder#g' optools/images/Dockerfile
-          sed -i 's#FROM ubuntu:latest#FROM ccr.ccs.tencentyun.com/cicd-runner/ubuntu:latest#g' optools/images/Dockerfile
+          sed -i 's#FROM golang:1.21.5-bookworm as builder#FROM ccr.ccs.tencentyun.com/cicd-runner/golang:1.21.5-bookworm as builder#g' optools/images/Dockerfile
+          sed -i 's#FROM ubuntu:22.04#FROM ccr.ccs.tencentyun.com/cicd-runner/ubuntu:22.04#g' optools/images/Dockerfile
 
           docker build -t $TAGS -f optools/images/Dockerfile . --build-arg GOPROXY='https://goproxy.cn,direct'
           docker push $TAGS

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,11 +19,8 @@ jobs:
         run: |
           echo ${{ steps.get_release.outputs.upload_url }}
           echo ${{ steps.get_release.outputs.tag_name }}
-      - name: Use Golang
-        uses: actions/setup-go@v4
-        with:
-          go-version: "1.20.11"
-          cache: false
+      - name: Set up Go
+        uses: ./.github/actions/setup_env
       - name: Build normal
         run: |
           make build
@@ -66,10 +63,9 @@ jobs:
         run: |
           echo ${{ steps.get_release.outputs.upload_url }}
           echo ${{ steps.get_release.outputs.tag_name }}
-      - name: Use Golang
-        uses: actions/setup-go@v4
+      - name: Set up Go
+        uses: ./.github/actions/setup_env
         with:
-          go-version: "1.20.11"
           cache: false
       - name: Build normal
         run: |
@@ -126,11 +122,8 @@ jobs:
         run: |
           echo ${{ steps.get_release.outputs.upload_url }}
           echo ${{ steps.get_release.outputs.tag_name }}
-      - name: Use Golang
-        uses: actions/setup-go@v4
-        with:
-          go-version: "1.20.11"
-          cache: false
+      - name: Set up Go
+        uses: ./.github/actions/setup_env
       - name: Build normal
         run: |
           make build

diff --git a/.github/workflows/robot.yml b/.github/workflows/robot.yml
@@ -95,18 +95,6 @@ jobs:
           uri_notice: ${{ secrets.DOCU_GROUP_HOOK }}
           name_label: "doc influence"
           mentions: "Prinz,DengNan"
-
-  auto-to-project:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'issues' && github.event.action == 'opened'
-    steps:
-      - name: Add Issue To GitHub Project
-        uses: actions/[email protected]
-        with:
-          project-url: https://github.com/orgs/matrixorigin/projects/13/views/1
-          github-token: ${{ secrets.TOKEN_ACTION }}
-          labeled: kind/bug,kind/docs,kind/enhancement,kind/feature,kind/questions,kind/performance,kind/refactoring,kind/subtask
-          label-operator: OR
 
   nightly-check:
     if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
@@ -117,10 +105,9 @@ jobs:
           fetch-depth: '3'
           path: ./matrixone
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: ./matrixone/.github/actions/setup_env
         with:
-          go-version: '1.20'
-          cache: true
+          cache: false
       - name: Set Variables
         run: |
           echo "ut_report='UT-Report.out'" >> $GITHUB_ENV

diff --git a/.github/workflows/utils.yaml b/.github/workflows/utils.yaml
@@ -88,10 +88,7 @@ jobs:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.event.pull_request.head.ref }}
       - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.20'
-          cache: true
+        uses: ./matrixone/.github/actions/setup_env
       - name: Set Variables
         run: |
           cd $GITHUB_WORKSPACE/matrixone

diff --git a/.golangci.yml b/.golangci.yml
@@ -1,4 +1,5 @@
 run:
+  concurrency: 8
   # Timeout for analysis, e.g. 30s, 5m.
   # Default: 1m
   timeout: 5m
@@ -36,6 +37,19 @@ linters:
     - unused
 
 linters-settings:
+  # https://github.com/golangci/golangci-lint/issues/3877
+  depguard:
+    rules:
+      main:
+        files:
+          - "$all"
+          - "!$test"
+        allow:
+          - $gostd
+          - github.com
+        deny:
+          - pkg: github.com/OpenPeeDeeP/depguard
+            desc: "example to deny some package"
   stylecheck:
     checks:
       - ST1001

diff --git a/Makefile b/Makefile
@@ -201,7 +201,7 @@ fmt:
 
 .PHONY: install-static-check-tools
 install-static-check-tools:
-	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | bash -s -- -b $(GOPATH)/bin v1.52.2
+	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | bash -s -- -b $(GOPATH)/bin v1.55.2
 	@go install github.com/matrixorigin/linter/cmd/molint@latest
 	@go install github.com/apache/skywalking-eyes/cmd/[email protected]
 

diff --git a/optools/bvt_ut/Dockerfile b/optools/bvt_ut/Dockerfile
@@ -1,4 +1,4 @@
-FROM matrixorigin/tester:go1.20-jdk8
+FROM matrixorigin/tester:go1.21.5-jdk8
 
 ARG GOPROXY="https://proxy.golang.org,direct"
 

diff --git a/optools/bvt_ut/entrypoint.sh b/optools/bvt_ut/entrypoint.sh
@@ -49,7 +49,7 @@ function run_bvt() {
   else
     # use test/distributed/cases as default test cases
     echo "> test case: test/distributed/cases"
-    cd mo-tester && ./run.sh -n -g -p /matrixone-test/test/distributed/cases 2>&1
+    cd mo-tester && ./run.sh -n -g -p /matrixone-test/test/distributed/cases -e optimistic 2>&1
   fi
 }
 

diff --git a/optools/compose_bvt/Dockerfile.tester b/optools/compose_bvt/Dockerfile.tester
@@ -1,4 +1,4 @@
-FROM matrixorigin/tester:go1.20-jdk8
+FROM matrixorigin/tester:go1.21.5-jdk8
 
 WORKDIR /
 

diff --git a/optools/images/Dockerfile b/optools/images/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.7-bookworm as builder
+FROM golang:1.21.5-bookworm as builder
 
 # goproxy
 ARG GOPROXY="https://proxy.golang.org,direct"
@@ -19,7 +19,7 @@ COPY . .
 
 RUN make build
 
-FROM ubuntu:latest
+FROM ubuntu:22.04
 
 COPY --from=builder /go/src/github.com/matrixorigin/matrixone/mo-service /mo-service
 COPY --from=builder /go/src/github.com/matrixorigin/matrixone/etc /etc