修改 action;

RealChuan · Nov 26, 2023 · 710d8e1 · 710d8e1
1 parent 9adb728
commit 710d8e1
Show file tree

Hide file tree

Showing 6 changed files with 112 additions and 35 deletions.
diff --git a/.github/workflows/clean.yml → .github/workflows/clean_cache.yml b/.github/workflows/clean.yml → .github/workflows/clean_cache.yml
@@ -1,4 +1,4 @@
-name: Cleanup Caches By A Branch
+name: Cleanup caches by a branch
 on:
   pull_request:
     types:

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -1,4 +1,4 @@
-name: CMake Build
+name: CMake build
 
 on: 
   # push代码时触发workflow
@@ -36,16 +36,19 @@ jobs:
           - "Ninja"
 
     steps:
-      - name: cache vcpkg
-        uses: actions/cache@v3
-        with:
-          path: |
-            C:\vcpkg\installed
-            /usr/local/share/vcpkg/installed
-          key: ${{ runner.os }}-vcpkg-installed-${{ matrix.os }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-vcpkg-installed-${{ matrix.os }}-
-            ${{ runner.os }}-vcpkg-installed-
+      - name: Restore windows vcpkg
+        if: startsWith(matrix.os, 'windows')
+        uses: actions/cache/restore@v3
+        with: 
+          path: C:\vcpkg\installed
+          key: ${{ runner.os }}-vcpkg-installed-${{ matrix.os }}
+      - name: Restore macos or ubuntu vcpkg
+        if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
+        uses: actions/cache/restore@v3
+        with: 
+          path: /usr/local/share/vcpkg/installed
+          key: ${{ runner.os }}-vcpkg-installed-${{ matrix.os }}
+
       - name: Install dependencies on windows
         if: startsWith(matrix.os, 'windows')
         shell: bash
@@ -79,7 +82,7 @@ jobs:
         with:
           version: ${{ matrix.qt_ver }}
           install-deps: 'true'
-          modules: 'qt5compat addons.qtnetworkauth addons.qtmultimedia addons.qtimageformats'
+          modules: 'qt5compat qtnetworkauth qtmultimedia qtimageformats'
           cache: 'true'
 
       - uses: actions/checkout@v3

diff --git a/.github/workflows/delete_workflow.yml b/.github/workflows/delete_workflow.yml
@@ -0,0 +1,65 @@
+name: Delete old workflow runs
+on:
+  workflow_dispatch:
+    inputs:
+      days:
+        description: 'Days-worth of runs to keep for each workflow'
+        required: true
+        default: '30'
+      minimum_runs:
+        description: 'Minimum runs to keep for each workflow'
+        required: true
+        default: '6'
+      delete_workflow_pattern:
+        description: 'Name or filename of the workflow (if not set, all workflows are targeted)'
+        required: false
+      delete_workflow_by_state_pattern:
+        description: 'Filter workflows by state: active, deleted, disabled_fork, disabled_inactivity, disabled_manually'
+        required: true
+        default: "ALL"
+        type: choice
+        options:
+          - "ALL"
+          - active
+          - deleted
+          - disabled_inactivity
+          - disabled_manually
+      delete_run_by_conclusion_pattern:
+        description: 'Remove runs based on conclusion: action_required, cancelled, failure, skipped, success'
+        required: true
+        default: "failure"
+        type: choice
+        options:
+          - "ALL"
+          - "Unsuccessful: action_required,cancelled,failure,skipped"
+          - action_required
+          - cancelled
+          - failure
+          - skipped
+          - success
+      dry_run:
+        description: 'Logs simulated changes, no deletions are performed'
+        required: false
+
+jobs:
+  del_runs:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+    steps:
+      - name: Delete workflow runs
+        uses: Mattraks/delete-workflow-runs@v2
+        with:
+          token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          retain_days: ${{ github.event.inputs.days }}
+          keep_minimum_runs: ${{ github.event.inputs.minimum_runs }}
+          delete_workflow_pattern: ${{ github.event.inputs.delete_workflow_pattern }}
+          delete_workflow_by_state_pattern: ${{ github.event.inputs.delete_workflow_by_state_pattern }}
+          delete_run_by_conclusion_pattern: >-
+            ${{
+              startsWith(github.event.inputs.delete_run_by_conclusion_pattern, 'Unsuccessful:')
+              && 'action_required,cancelled,failure,skipped'
+              || github.event.inputs.delete_run_by_conclusion_pattern
+            }}
+          dry_run: ${{ github.event.inputs.dry_run }}
diff --git a/.github/workflows/qmake.yml b/.github/workflows/qmake.yml
@@ -1,4 +1,4 @@
-name: QMake Build
+name: QMake build
 
 on: 
   # push代码时触发workflow
@@ -32,16 +32,19 @@ jobs:
           - 6.6.1
 
     steps:
-      - name: cache vcpkg
-        uses: actions/cache@v3
-        with:
-          path: |
-            C:\vcpkg\installed
-            /usr/local/share/vcpkg/installed
-          key: ${{ runner.os }}-vcpkg-installed-${{ matrix.os }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-vcpkg-installed-${{ matrix.os }}-
-            ${{ runner.os }}-vcpkg-installed-
+      - name: Restore windows vcpkg
+        if: startsWith(matrix.os, 'windows')
+        uses: actions/cache/restore@v3
+        with: 
+          path: C:\vcpkg\installed
+          key: ${{ runner.os }}-vcpkg-installed-${{ matrix.os }}
+      - name: Restore macos or ubuntu vcpkg
+        if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
+        uses: actions/cache/restore@v3
+        with: 
+          path: /usr/local/share/vcpkg/installed
+          key: ${{ runner.os }}-vcpkg-installed-${{ matrix.os }}
+
       - name: Install dependencies on windows
         if: startsWith(matrix.os, 'windows')
         shell: bash
@@ -75,7 +78,7 @@ jobs:
         with:
           version: ${{ matrix.qt_ver }}
           install-deps: 'true'
-          modules: 'qt5compat addons.qtnetworkauth addons.qtmultimedia addons.qtimageformats'
+          modules: 'qt5compat qtnetworkauth qtmultimedia qtimageformats'
           cache: 'true'
 
       - uses: actions/checkout@v3

diff --git a/.github/workflows/toolchain.yml b/.github/workflows/toolchain.yml
@@ -1,4 +1,4 @@
-name: Build Toolchain
+name: Build toolchain
 
 on: 
   # 每周一 0 点触发
@@ -28,7 +28,7 @@ jobs:
         with:
           version: ${{ matrix.qt_ver }}
           install-deps: 'true'
-          modules: 'qt5compat addons.qtnetworkauth addons.qtmultimedia addons.qtimageformats'
+          modules: 'qt5compat qtnetworkauth qtmultimedia qtimageformats'
           cache: 'true'
 
       - name: Install dependencies on windows
@@ -59,10 +59,16 @@ jobs:
           gcc --version
           vcpkg install breakpad ffmpeg[opengl,ass,bzip2,freetype,fribidi,zlib,gpl] --triplet x64-linux
 
-      - name: cache vcpkg
+      - name: cache windows vcpkg
+        if: startsWith(matrix.os, 'windows')
         uses: actions/cache/save@v3
-        with:
-          path: |
-            C:\vcpkg\installed
-            /usr/local/share/vcpkg/installed
-          key: ${{ runner.os }}-vcpkg-installed-${{ matrix.os }}-${{ github.sha }}
+        with: 
+          path: C:\vcpkg\installed
+          key: ${{ runner.os }}-vcpkg-installed-${{ matrix.os }}
+      - name: cache macos or ubuntu vcpkg
+        if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
+        uses: actions/cache/save@v3
+        with: 
+          path: /usr/local/share/vcpkg/installed
+          key: ${{ runner.os }}-vcpkg-installed-${{ matrix.os }}
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,11 +18,11 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include(utils)
 
 if(CMAKE_HOST_WIN32)
-  list(APPEND CMAKE_PREFIX_PATH "C:\\Qt\\6.6.0\\msvc2019_64")
+  list(APPEND CMAKE_PREFIX_PATH "C:\\Qt\\6.6.1\\msvc2019_64")
 elseif(CMAKE_HOST_APPLE)
 
 elseif(CMAKE_HOST_UNIX)
-  list(APPEND CMAKE_PREFIX_PATH "/opt/Qt/6.6.0/gcc_64")
+  list(APPEND CMAKE_PREFIX_PATH "/opt/Qt/6.6.1/gcc_64")
 endif()
 
 project(