Merge branch 'master' into issue_10475_innerPipeline_fix_yj

# Conflicts: # src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/MarketAtomEnvServiceImpl.kt # src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/service/impl/StoreProjectServiceImpl.kt
yjieliang · Oct 9, 2024 · 599bde4 · 599bde4
2 parents dac56b4 + c770eba
commit 599bde4
Show file tree

Hide file tree

Showing 1,712 changed files with 94,920 additions and 27,840 deletions.
diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml
@@ -35,7 +35,7 @@ jobs:
         key: ${{ runner.os }}-go-${{ hashFiles('src/agent/agent/go.sum') }}
     - run: make BUILD_OUT_TAG=out clean all
       working-directory: src/agent/agent/
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: ${{ inputs.upload == 'true'  }}
       with:
         name: agent

diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -55,7 +55,7 @@ jobs:
       run: |
         ./gradlew clean test build :core:worker:worker-agent:shadowJar \
         -DmysqlURL=127.0.0.1:${{ job.services.mysql.ports['3306'] }} -DmysqlUser=root -DmysqlPasswd=root --no-daemon
-    - uses: actions/upload-artifact@v1
+    - uses: actions/upload-artifact@v4
       if: ${{ inputs.upload == 'true'  }}
       with:
         name: backend-jar
@@ -95,7 +95,7 @@ jobs:
       run: |
         ./gradlew clean test build :core:worker:worker-agent:shadowJar -Ddevops.assemblyMode=KUBERNETES \
         -DmysqlURL=127.0.0.1:${{ job.services.mysql.ports['3306'] }} -DmysqlUser=root -DmysqlPasswd=root --no-daemon
-    - uses: actions/upload-artifact@v1
+    - uses: actions/upload-artifact@v4
       if: ${{ inputs.upload == 'true'  }}
       with:
         name: backend-docker

diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
@@ -5,7 +5,7 @@ name: Frontend CI
 
 on:
   push:
-    branches: [master]
+    branches: ["*"]
     paths:
       - "src/frontend/**"
   pull_request:
@@ -25,24 +25,29 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 9.5.0
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
-      - uses: actions/cache@v3
-        id: yarn-cache
+          node-version: 20
+          cache: "pnpm"
+          cache-dependency-path: src/frontend/pnpm-lock.yaml
+      - uses: nrwl/nx-set-shas@v4
         with:
-          path: src/frontend/**/node_modules
-          key: ${{ runner.os }}-yarn-${{ hashFiles('src/frontend/**/package.json') }}
-      - name: prefer offline
-        if: steps.yarn-cache.outputs.cache-hit != 'true'
-        run: yarn --prefer-offline && yarn install
-        working-directory: src/frontend
+          main-branch-name: master
+      - run: |
+          echo "BASE: ${{ env.NX_BASE }}"
+          echo "HEAD: ${{ env.NX_HEAD }}"
       - run: |
+          pnpm install
           export NODE_OPTIONS=--openssl-legacy-provider
-          yarn public
+          pnpm public
         working-directory: src/frontend
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: ${{ inputs.upload == 'true'  }}
         with:
           name: frontend

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,17 +30,17 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: download frontend
-      uses: actions/download-artifact@v1
+      uses: actions/download-artifact@v4.1.7
       with:
         name: frontend
         path: src/frontend/frontend
     - name: download agent
-      uses: actions/download-artifact@v1
+      uses: actions/download-artifact@v4.1.7
       with:
         name: agent
         path: src/agent/agent/bin/
     - name: download backend
-      uses: actions/download-artifact@v1
+      uses: actions/download-artifact@v4.1.7
       with:
         name: backend-jar
         path: src/backend/ci/release
@@ -49,7 +49,7 @@ jobs:
         version="$(basename $GITHUB_REF)"
         echo "version=$version" >> $GITHUB_OUTPUT
         ci_ms_wip="sign,monitoring" ci_pkg_dir=/dev/shm/ci ./scripts/packager-ci.sh "$version" bkci-slim.tar.gz
-    - uses: actions/upload-artifact@v1
+    - uses: actions/upload-artifact@v4
       with:
         name: bkci-slim
         path: bkci-slim.tar.gz
@@ -61,17 +61,17 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: download frontend
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4.1.7
         with:
           name: frontend
           path: src/frontend/frontend
       - name: download agent
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4.1.7
         with:
           name: agent
           path: src/agent/agent/bin/
       - name: download bkci
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4.1.7
         with:
           name: backend-docker
           path: src/backend/ci/release
@@ -120,7 +120,7 @@ jobs:
         version="$(basename $GITHUB_REF)"
         helm package . --version $version --app-version $version
         mv bk-ci-$version.tgz bk-ci-charts.tgz
-    - uses: actions/upload-artifact@v1
+    - uses: actions/upload-artifact@v4
       with:
         name: bkci-chart
         path: helm-charts/core/ci/bk-ci-charts.tgz
@@ -131,12 +131,12 @@ jobs:
     needs: [package-zip, package-helm]
     steps:
     - name: download bkci-slim
-      uses: actions/download-artifact@v1
+      uses: actions/download-artifact@v4.1.7
       with:
         name: bkci-slim
         path: ./
     - name: download bkci-chart
-      uses: actions/download-artifact@v1
+      uses: actions/download-artifact@v4.1.7
       with:
         name: bkci-chart
         path: ./