Merge branch 'refs/heads/main' into new_table_for_instance_console

# Conflicts: # cache/service/instance.go # go.mod # go.sum # store/mock/api_mock.go
polarismesh · Sep 24, 2024 · c765ac6 · c765ac6
2 parents fff45cf + 9af1772
commit c765ac6
Show file tree

Hide file tree

Showing 530 changed files with 44,709 additions and 17,717 deletions.
diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml
@@ -64,7 +64,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: 
+          go-version: "1.21.5"
       # Checkout latest code
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -100,7 +100,6 @@ jobs:
 
           sleep 120s
           ls -alR
-          cat ./log/stdout 2>&1
 
           cd ..
           ls -lstrh

diff --git a/.github/workflows/codecov.yaml b/.github/workflows/codecov.yaml
@@ -54,7 +54,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21.5"
       # Checkout latest code
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -72,8 +72,8 @@ jobs:
           mysql -e "ALTER USER '${{ env.MYSQL_DB_USER }}'@'localhost' IDENTIFIED WITH mysql_native_password BY 'root';"  -u${{ env.MYSQL_DB_USER }} -p${{ env.MYSQL_DB_PWD }}
 
       # Execute vert check
-      - name: Vert check
-        run: bash vert.sh -install && bash vert.sh
+      # - name: Vert check
+      #   run: bash vert.sh -install && bash vert.sh
 
       - name: Standalone Test
         env:
@@ -100,6 +100,6 @@ jobs:
           bash test/codecov.sh
 
       - name: Upload Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21.5"
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
@@ -53,7 +53,7 @@ jobs:
           password: ${{ secrets.POLARIS_DOCKER_PASSWORD }}
 
       - name: Build Server
-        id: build-server
+        id: build-hub-server
         env:
           GOOS: ${{ matrix.goos }}
           GOARCH: ${{ matrix.goarch }}
@@ -63,7 +63,7 @@ jobs:
           make build-docker IMAGE_TAG=${DOCKER_TAG}
 
       - name: Build Prometheus
-        id: build-prom
+        id: build-hub-prom
         env:
           GOOS: ${{ matrix.goos }}
           GOARCH: ${{ matrix.goarch }}
@@ -72,3 +72,33 @@ jobs:
           cd release/standalone/docker/prometheus
           ls -lstrh
           bash build_docker_prom.sh ${DOCKER_TAG}
+
+      - name: Log in to Tencent CCR
+        uses: docker/login-action@v1
+        with:
+          registry: ccr.ccs.tencentyun.com
+          username: ${{ secrets.TENCENT_DOCKER_NAME }}
+          password: ${{ secrets.TENCENT_DOCKER_PASSWORD }}
+
+      - name: Build Server
+        id: build-tencent-server
+        env:
+          DOCKER_REPOSITORY: ccr.ccs.tencentyun.com/polarismesh
+          GOOS: ${{ matrix.goos }}
+          GOARCH: ${{ matrix.goarch }}
+          DOCKER_TAG: ${{ steps.get_version.outputs.VERSION }}
+        run: |
+          ls -lstrh
+          make build-docker IMAGE_TAG=${DOCKER_TAG}
+
+      - name: Build Prometheus
+        id: build-tencent-prom
+        env:
+          DOCKER_REPOSITORY: ccr.ccs.tencentyun.com/polarismesh
+          GOOS: ${{ matrix.goos }}
+          GOARCH: ${{ matrix.goarch }}
+          DOCKER_TAG: ${{ steps.get_version.outputs.VERSION }}
+        run: |
+          cd release/standalone/docker/prometheus
+          ls -lstrh
+          bash build_docker_prom.sh ${DOCKER_TAG}
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -29,7 +29,7 @@ jobs:
   golangci:
     strategy:
       matrix:
-        go-version: [ "1.20" ]
+        go-version: [ "1.21.5" ]
     name: golangci-lint
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/integration-testing-mysql.yml b/.github/workflows/integration-testing-mysql.yml
@@ -78,7 +78,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21.5"
       # Checkout latest code
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -145,8 +145,6 @@ jobs:
 
           sleep 120s
           ls -alR
-          cat ./log/stdout 2>&1
-
           cd ..
           ls -lstrh
           # 先测试普通的集成测试

diff --git a/.github/workflows/integration-testing.yml b/.github/workflows/integration-testing.yml
@@ -64,7 +64,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21.5"
       # Checkout latest code
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -100,7 +100,6 @@ jobs:
 
           sleep 120s
           ls -alR
-          cat ./log/stdout 2>&1
 
           cd ..
           ls -lstrh

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21.5"
 
       - name: Get version
         id: get_version

diff --git a/.github/workflows/standalone.yml b/.github/workflows/standalone.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21.5"
 
       - name: Build
         id: build
@@ -78,18 +78,10 @@ jobs:
         with:
           tag_name: ${{ github.event.inputs.server_version }}
 
-      # - name: Upload asset
-      #   uses: actions/upload-release-asset@v1
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #   with:
-      #     upload_url: ${{ steps.get_release_by_tag.outputs.upload_url }}
-      #     asset_path: ./${{ steps.build.outputs.name }}
-      #     asset_name: ${{ steps.build.outputs.name }}
-      #     asset_content_type: application/gzip
       - name: Upload
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SERVER_VERSION: ${{ github.event.inputs.server_version }}
         run: |
+          sudo apt-get update && sudo apt-get install -y hub
           hub release edit $(find . -type f -name "polaris-*.zip" -printf "-a %p ") -m "" "${SERVER_VERSION}"