From 40381a673448df25edfad4015e6b98475c4db5ff Mon Sep 17 00:00:00 2001
From: heyli <lcxfs1991@gmail.com>
Date: Mon, 22 Jan 2024 22:19:45 +0800
Subject: [PATCH] feat: improve

---
 .github/workflows/docker-image.yml |  8 +--
 .github/workflows/main.yml         | 94 +++++++++++++++---------------
 2 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index c7d76c24ca34..c1d533b9f74d 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -28,13 +28,13 @@ jobs:
     - name: Fetch default.conf
       uses: valitydev/action-download-file@v1
       with:
-          url: https://raw.githubusercontent.com/lcxfs1991/docschina-deployment/main/webpack4/default.conf
+          url: https://raw.githubusercontent.com/lcxfs1991/docschina-deployment/main/webpack5/default.conf
           target-path: .
 
     - name: Fetch Dockerfile
       uses: valitydev/action-download-file@v1
       with:
-          url: https://raw.githubusercontent.com/lcxfs1991/docschina-deployment/main/webpack4/Dockerfile
+          url: https://raw.githubusercontent.com/lcxfs1991/docschina-deployment/main/webpack5/Dockerfile
           target-path: .
       
 
@@ -57,7 +57,7 @@ jobs:
         context: .
         push: true
         platforms: linux/amd64
-        tags: ccr.ccs.tencentyun.com/docschina/webpack4:${{ env.BRANCH_NAME }}-${{ env.TIMESTAMP }}
+        tags: ccr.ccs.tencentyun.com/docschina/webpack5:${{ env.BRANCH_NAME }}-${{ env.TIMESTAMP }}
 
     - name: Deployment
       uses: TencentCloud/cli-action@v1
@@ -65,5 +65,5 @@ jobs:
         secret_id: ${{ secrets.SECRET_ID }}
         secret_key: ${{ secrets.SECRET_KEY }}
         region: ${{ secrets.LIGHTHOUSE_REGION }}
-        commands: tat InvokeCommand --cli-unfold-argument --region ap-shanghai --CommandId cmd-boc4aaiw --InstanceIds lhins-nkwfootc --Parameters '{"deployment":"webpack4","image":"ccr.ccs.tencentyun.com/docschina/webpack4:${{ env.BRANCH_NAME }}-${{ env.TIMESTAMP }}"}'
+        commands: tat InvokeCommand --cli-unfold-argument --region ap-shanghai --CommandId cmd-boc4aaiw --InstanceIds lhins-nkwfootc --Parameters '{"deployment":"webpack5","image":"ccr.ccs.tencentyun.com/docschina/webpack5:${{ env.BRANCH_NAME }}-${{ env.TIMESTAMP }}"}'
         output_format: json
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 83fa02cee2fc..adbc1eb6f07e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,47 +1,47 @@
-# # This file should modified carefully.
-
-# name: CI
-
-# # Controls when the action will run. Triggers the workflow on push or pull request
-# # events but only for the master branch
-# on:
-#   push:
-#     branches: [cn]
-
-# # A workflow run is made up of one or more jobs that can run sequentially or in parallel
-# jobs:
-#   # This workflow contains a single job called "build"
-#   build:
-#     # The type of runner that the job will run on
-#     runs-on: ubuntu-latest
-
-#     # Steps represent a sequence of tasks that will be executed as part of the job
-#     steps:
-#       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-#       - uses: actions/checkout@v2
-
-#       - name: Install
-#         run: |
-#           yarn
-#           yarn clean
-
-#       - name: Build
-#         run: |
-#           yarn build
-
-#       - name: Check Build
-#         run: |
-#           sudo -i
-#           sudo chown -R $USER ./dist
-
-#       - name: Docschina Github Action
-#         id: deployStatic
-#         uses: lcxfs1991/docschina-actions@master
-#         with:
-#           skipFiles: ${{ secrets.SKIP_FILES }}
-#           secretId: ${{ secrets.SECRET_ID }}
-#           secretKey: ${{ secrets.SECRET_KEY }}
-#           staticSrcPath: ./dist
-#           bucket: ${{ secrets.BUCKET }}
-#           region: ${{ secrets.REGION }}
-#           forceFiles: ${{ secrets.FORCE_FILES }}
+# This file should modified carefully.
+
+name: CI
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: []
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      - name: Install
+        run: |
+          yarn
+          yarn clean
+
+      - name: Build
+        run: |
+          yarn build
+
+      - name: Check Build
+        run: |
+          sudo -i
+          sudo chown -R $USER ./dist
+
+      - name: Docschina Github Action
+        id: deployStatic
+        uses: lcxfs1991/docschina-actions@master
+        with:
+          skipFiles: ${{ secrets.SKIP_FILES }}
+          secretId: ${{ secrets.SECRET_ID }}
+          secretKey: ${{ secrets.SECRET_KEY }}
+          staticSrcPath: ./dist
+          bucket: ${{ secrets.BUCKET }}
+          region: ${{ secrets.REGION }}
+          forceFiles: ${{ secrets.FORCE_FILES }}