chore: retrigger CI

Signed-off-by: Huang Rui <vowstar@gmail.com>

Author: vowstar

.github/workflows/build.yml

@@ -200,12 +200,27 @@ jobs:
     - name: Install tools
       run: brew install ninja pkg-config
 
+    - name: Patch slang for Apple Clang
+      run: >-
+        python3 -c "
+        import pathlib;
+        f=pathlib.Path('external/slang/source/analysis/DriverTracker.cpp');
+        t=f.read_text();
+        t=t.replace(
+        'for (auto& [valueSym, drivers] : procedure.getDrivers()) {\n        auto updateFunc = [&](auto& elem) {\n            for (auto& [driver, bounds] : drivers)',
+        'for (auto& [valueSym, drivers] : procedure.getDrivers()) {\n        auto& driversRef = drivers;\n        auto updateFunc = [&](auto& elem) {\n            for (auto& [driver, bounds] : driversRef)');
+        t=t.replace(
+        'for (auto& [valueSym, drivers] : symbolDriverList) {\n        auto updateFunc = [&](auto& elem) {\n            for (auto& [driver, bounds] : drivers)',
+        'for (auto& [valueSym, drivers] : symbolDriverList) {\n        auto& driversRef = drivers;\n        auto updateFunc = [&](auto& elem) {\n            for (auto& [driver, bounds] : driversRef)');
+        f.write_text(t)"
+
     - 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 }}
+        -DSLANG_USE_MIMALLOC=OFF
         -DENABLE_UNIT_TEST=OFF
         -DENABLE_CLANG_TIDY=OFF
         -DENABLE_DOXYGEN=OFF
@@ -216,6 +231,7 @@ jobs:
         cmake -B build -G Ninja
         -DCMAKE_POLICY_VERSION_MINIMUM=3.5
         -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}
+        -DSLANG_USE_MIMALLOC=OFF
         -DENABLE_CLANG_TIDY=OFF
         -DENABLE_DOXYGEN=OFF
 
@@ -226,7 +242,7 @@ jobs:
       if: github.event_name == 'push'
       run: |
         set -e
-        QSOC=./build/qsoc
+        QSOC=./build/qsoc.app/Contents/MacOS/qsoc
         TMPD=$(mktemp -d)
         trap "rm -rf $TMPD" EXIT
         echo "--- version ---"
@@ -247,7 +263,7 @@ jobs:
       if: github.event_name == 'pull_request'
       run: |
         cd build
-        ctest -C ${{ env.BUILD_TYPE }} --rerun-failed --output-on-failure
+        QT_QPA_PLATFORM=offscreen ctest -C ${{ env.BUILD_TYPE }} --rerun-failed --output-on-failure
 
   cppcheck:
     runs-on: ubuntu-latest

.github/workflows/release.yml

@@ -223,11 +223,26 @@ jobs:
     - name: Install tools
       run: brew install ninja pkg-config
 
+    - name: Patch slang for Apple Clang
+      run: >-
+        python3 -c "
+        import pathlib;
+        f=pathlib.Path('external/slang/source/analysis/DriverTracker.cpp');
+        t=f.read_text();
+        t=t.replace(
+        'for (auto& [valueSym, drivers] : procedure.getDrivers()) {\n        auto updateFunc = [&](auto& elem) {\n            for (auto& [driver, bounds] : drivers)',
+        'for (auto& [valueSym, drivers] : procedure.getDrivers()) {\n        auto& driversRef = drivers;\n        auto updateFunc = [&](auto& elem) {\n            for (auto& [driver, bounds] : driversRef)');
+        t=t.replace(
+        'for (auto& [valueSym, drivers] : symbolDriverList) {\n        auto updateFunc = [&](auto& elem) {\n            for (auto& [driver, bounds] : drivers)',
+        'for (auto& [valueSym, drivers] : symbolDriverList) {\n        auto& driversRef = drivers;\n        auto updateFunc = [&](auto& elem) {\n            for (auto& [driver, bounds] : driversRef)');
+        f.write_text(t)"
+
     - name: Configure CMake
       run: >-
         cmake -B build -G Ninja
         -DCMAKE_POLICY_VERSION_MINIMUM=3.5
         -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}
+        -DSLANG_USE_MIMALLOC=OFF
         -DENABLE_CLANG_TIDY=OFF
         -DENABLE_DOXYGEN=OFF
         -DENABLE_UNIT_TEST=OFF
@@ -237,26 +252,10 @@ jobs:
 
     - 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
+        mkdir deploy
+        cp -a build/qsoc.app deploy/QSoC.app
         macdeployqt deploy/QSoC.app -verbose=1
-        # Also keep standalone CLI binary
-        cp build/qsoc deploy/
+        cp deploy/QSoC.app/Contents/MacOS/qsoc deploy/qsoc
 
     - name: Verify deployment
       run: |

CMakeLists.txt

@@ -422,6 +422,7 @@ 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}