feat(ci): add macOS ARM build, test and release

vowstar · vowstar · commit ff92a02b481d · 2026-04-16T14:50:33.000+08:00
- Add build-macos job to build.yml (macos-14 ARM runner)
- Add build-macos job to release.yml with macdeployqt + DMG
- Remove MACOSX_BUNDLE (same CLI/GUI duality fix as Windows)
- macOS smoke test: version, project, bus, module import
- Release: QSoC.app bundle + standalone CLI in DMG
- DMG contains both .app (double-click GUI) and qsoc CLI binary

Signed-off-by: Huang Rui &lt;vowstar@gmail.com&gt;
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -178,6 +178,77 @@ jobs:
         cd build
         ctest -C ${{ env.BUILD_TYPE }} --rerun-failed --output-on-failure -E "test_qsocgui|test_qsocagenttool$|test_qsoccliparsegeneratereportunconnected"
 
+  build-macos:
+    runs-on: macos-14
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v4
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'mac'
+        target: 'desktop'
+        arch: 'clang_64'
+        modules: 'qt5compat'
+        cache: 'true'
+        cache-key-prefix: 'install-qt-action-macos'
+
+    - name: Install tools
+      run: brew install ninja pkg-config
+
+    - name: Configure CMake (push - no tests)
+      if: github.event_name == 'push'
+      run: >-
+        cmake -B build -G Ninja
+        -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+        -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}
+        -DENABLE_UNIT_TEST=OFF
+        -DENABLE_CLANG_TIDY=OFF
+        -DENABLE_DOXYGEN=OFF
+
+    - name: Configure CMake (PR - with tests)
+      if: github.event_name == 'pull_request'
+      run: >-
+        cmake -B build -G Ninja
+        -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+        -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}
+        -DENABLE_CLANG_TIDY=OFF
+        -DENABLE_DOXYGEN=OFF
+
+    - name: Build
+      run: cmake --build build --config ${{ env.BUILD_TYPE }}
+
+    - name: Smoke Test
+      if: github.event_name == 'push'
+      run: |
+        set -e
+        QSOC=./build/qsoc
+        TMPD=$(mktemp -d)
+        trap "rm -rf $TMPD" EXIT
+        echo "--- version ---"
+        $QSOC -v
+        echo "--- help ---"
+        $QSOC -h | head -3
+        echo "--- project create ---"
+        $QSOC project create -d "$TMPD" smoke_test
+        echo "--- bus import ---"
+        printf 'Name;Mode;Direction;Width;Qualifier\npclk;slave;in;1;\nprdata;slave;out;32;data\n' > "$TMPD/smoke.csv"
+        $QSOC bus import -d "$TMPD" -l smoke_lib -b smoke_bus "$TMPD/smoke.csv"
+        echo "--- module import ---"
+        printf 'module smoke_mod(input clk, output [7:0] data);\nassign data = 8'\''hFF;\nendmodule\n' > "$TMPD/smoke.v"
+        $QSOC module import -d "$TMPD" -l smoke_lib "$TMPD/smoke.v"
+        echo "--- all smoke tests passed ---"
+
+    - name: Full Test
+      if: github.event_name == 'pull_request'
+      run: |
+        cd build
+        ctest -C ${{ env.BUILD_TYPE }} --rerun-failed --output-on-failure
+
   cppcheck:
     runs-on: ubuntu-latest
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -201,8 +201,81 @@ jobs:
         name: windows-exe
         path: deploy/
 
+  build-macos:
+    runs-on: macos-14
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v4
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'mac'
+        target: 'desktop'
+        arch: 'clang_64'
+        modules: 'qt5compat'
+        cache: 'true'
+        cache-key-prefix: 'install-qt-action-macos'
+
+    - name: Install tools
+      run: brew install ninja pkg-config
+
+    - name: Configure CMake
+      run: >-
+        cmake -B build -G Ninja
+        -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+        -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}
+        -DENABLE_CLANG_TIDY=OFF
+        -DENABLE_DOXYGEN=OFF
+        -DENABLE_UNIT_TEST=OFF
+
+    - name: Build
+      run: cmake --build build --config ${{ env.BUILD_TYPE }}
+
+    - name: Deploy
+      run: |
+        mkdir -p deploy/QSoC.app/Contents/MacOS
+        cp build/qsoc deploy/QSoC.app/Contents/MacOS/
+        cat > deploy/QSoC.app/Contents/Info.plist << 'EOF'
+        <?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+        <plist version="1.0">
+        <dict>
+          <key>CFBundleExecutable</key><string>qsoc</string>
+          <key>CFBundleIdentifier</key><string>com.vowstar.qsoc</string>
+          <key>CFBundleName</key><string>QSoC</string>
+          <key>CFBundleVersion</key><string>1.0.2</string>
+          <key>CFBundleShortVersionString</key><string>1.0</string>
+          <key>CFBundlePackageType</key><string>APPL</string>
+          <key>LSMinimumSystemVersion</key><string>11.0</string>
+        </dict>
+        </plist>
+        EOF
+        macdeployqt deploy/QSoC.app -verbose=1
+        # Also keep standalone CLI binary
+        cp build/qsoc deploy/
+
+    - name: Verify deployment
+      run: |
+        deploy/qsoc -v
+        deploy/QSoC.app/Contents/MacOS/qsoc -v
+
+    - name: Create DMG
+      run: |
+        hdiutil create -volname "QSoC" -srcfolder deploy -ov -format UDZO \
+          "QSoC-${{ github.ref_name }}-macos-arm64.dmg"
+
+    - name: Upload artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: macos-dmg
+        path: QSoC-*.dmg
+
   release:
-    needs: [build-linux, build-windows]
+    needs: [build-linux, build-windows, build-macos]
     runs-on: ubuntu-22.04
 
     steps:
@@ -218,13 +291,15 @@ jobs:
       run: |
         ls -la linux-appimage/
         ls -la QSoC-*-windows-x64.zip
+        ls -la macos-dmg/
 
     - name: Create Release
       uses: softprops/action-gh-release@v2
       with:
         files: |
           linux-appimage/QSoC-*-x86_64.AppImage
           QSoC-*-windows-x64.zip
+          macos-dmg/QSoC-*-macos-arm64.dmg
         body: |
           **Full Changelog**: https://github.com/${{ github.repository }}/commits/${{ github.ref_name }}
         draft: false
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -422,7 +422,6 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
     MACOSX_BUNDLE_GUI_IDENTIFIER com.vowstar.${PROJECT_NAME}
     MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
     MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
-    MACOSX_BUNDLE TRUE
 )
 
 install(TARGETS ${PROJECT_NAME}

Original file line number	Diff line number	Diff line change
`@@ -422,7 +422,6 @@ set_target_properties(${PROJECT_NAME} PROPERTIES`
`422`	`422`	`MACOSX_BUNDLE_GUI_IDENTIFIER com.vowstar.${PROJECT_NAME}`
`423`	`423`	`MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}`
`424`	`424`	`MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}`
`425`		`- MACOSX_BUNDLE TRUE`
`426`	`425`	`)`
`427`	`426`
`428`	`427`	`install(TARGETS ${PROJECT_NAME}`