ci: fix run error (#13)

NJUPT-SAST-Cpp · Feb 19, 2024 · 1705c99 · 1705c99
1 parent 4a41d1a
commit 1705c99
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 19 deletions.
diff --git a/.github/workflows/cpp-linter.yml b/.github/workflows/cpp-linter.yml
@@ -8,17 +8,19 @@ permissions:
 on:
   push:
     paths:
+      - "*.txt"
       - "src/**"
       - "!**.qml"
       - "!**.md"
       - "!**.cmake"
-
+      - ".github/**"
   pull_request:
     paths:
       - "src/**"
       - "!**.qml"
       - "!**.md"
-      - "!**.cmake"
+      - "!**.cmake"  
+  workflow_dispatch:
 
 env:
   BUILD_TYPE: Release
@@ -36,10 +38,6 @@ jobs:
       with:
         version: '1.11.1'
 
-    # https://github.com/zhuzichu520/FluentUI/blob/06c9b4e3829af636234a98f946603d68c23f6459/.github/workflows/ubuntu.yml#L49-L50
-    - name: Install GL library (Ubuntu)
-      run: sudo apt-get install -y libxcb-cursor0 libgl1-mesa-dev libxcb1-dev libgtk-3-dev libxkbcommon-x11-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxcb-xinerama0-dev libxcb-sync-dev  libxcb-render-util0-dev libxcb-shm0-dev 
-
     - name: Install Qt
       uses: jurplel/install-qt-action@v3
       with:
@@ -65,3 +63,7 @@ jobs:
         thread-comments: ${{ github.event_name == 'pull_request' }}
         lines-changed-only: false
         files-changed-only: true
+
+    - name: Failed if needed
+      if: steps.linter.outputs.checks-failed > 0
+      run: exit 1
diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml
@@ -8,6 +8,12 @@ on:
       - "!**.md"
       - "!**.cmake"
       - ".github/**"
+  pull_request:
+    paths:
+      - "src/**"
+      - "!**.qml"
+      - "!**.md"
+      - "!**.cmake"  
   workflow_dispatch:
 
 permissions: write-all
@@ -17,7 +23,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-13]
+        os: [macos-latest]
         qt_ver: [6.6.1]
         qt_arch: [clang_64]
     env:
@@ -53,7 +59,7 @@ jobs:
       - name: pakage
         if: startsWith(github.event.ref, 'refs/tags/')
         run: |
-          sudo find /Users/runner/work/FluentUI/Qt/6.5.3/macos/qml -name "*.dSYM" | xargs rm -r
+          sudo find /Users/runner/work/sast-music/Qt/6.6.1/macos/qml -name "*.dSYM" | xargs rm -r
           sudo macdeployqt bin/release/sast_music.app -qmldir=. -verbose=1 -dmg
        
       - uses: actions/upload-artifact@v2

diff --git a/.github/workflows/ubuntu.yaml b/.github/workflows/ubuntu.yaml
@@ -8,6 +8,12 @@ on:
       - "!**.md"
       - "!**.cmake"
       - ".github/**"
+  pull_request:
+    paths:
+      - "src/**"
+      - "!**.qml"
+      - "!**.md"
+      - "!**.cmake"  
   workflow_dispatch:
 
 permissions: write-all
@@ -17,7 +23,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-latest]
         qt_ver: [6.6.1]
         qt_arch: [gcc_64]
     env:
@@ -28,23 +34,27 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-
-      - name: setup Ninja
-        uses: ashutoshvarma/[email protected]
-        with:
-          version: "1.11.1"
-
-      - name: install GL library (Ubuntu)
-        run: sudo apt-get install -y libxcb-cursor0 libgl1-mesa-dev libxcb1-dev libgtk-3-dev libxkbcommon-x11-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxcb-xinerama0-dev libxcb-sync-dev  libxcb-render-util0-dev libxcb-shm0-dev
-
+
       - name: install Qt
         uses: jurplel/install-qt-action@v3
+
         with:
           version: ${{ matrix.qt_ver }}
           cache: ${{ steps.cache-qt.outputs.cache-hit }}
           arch: ${{ matrix.qt_arch }}
           modules: ${{ env.QT_MODULES }}
 
+      - name: setup Ninja
+        uses: ashutoshvarma/[email protected]
+        with:
+          version: "1.11.1"
+
+      - name: install GL library (Ubuntu)
+        run: sudo apt-get install -y libxcb-cursor0 libgl1-mesa-dev libxcb1-dev libgtk-3-dev libxkbcommon-x11-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxcb-xinerama0-dev libxcb-sync-dev  libxcb-render-util0-dev libxcb-shm0-dev
+
+      - name: ubuntu install libfuse2
+        run: sudo apt install libfuse2
+
       - name: install Fcitx5 for Qt
         run: |
           sudo apt-get install -y extra-cmake-modules

diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
@@ -8,6 +8,12 @@ on:
       - "!**.md"
       - "!**.cmake"
       - ".github/**"
+  pull_request:
+    paths:
+      - "src/**"
+      - "!**.qml"
+      - "!**.md"
+      - "!**.cmake"  
   workflow_dispatch:
 
 permissions: write-all
@@ -17,7 +23,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-2022]
+        os: [windows-latest]
         include:
           - qt_ver: 6.6.1
             qt_arch: win64_msvc2019_64