Add codesign step

Signed-off-by: falkTX <[email protected]>

.github/workflows/build.yml

@@ -73,11 +73,13 @@ jobs:
         run: |
           ./src/PawPaw/bootstrap-mod.sh linux-x86_64 && ./src/PawPaw/.cleanup.sh linux-x86_64
       - name: Build
-        if: steps.cache.outputs.cache-hit == 'true'
+        if: false
+        #if: steps.cache.outputs.cache-hit == 'true'
         run: |
           make
       - name: Validate plugins
-        if: steps.cache.outputs.cache-hit == 'true'
+        if: false
+        #if: steps.cache.outputs.cache-hit == 'true'
         run: |
           ./utils/plugin-builder/validate-plugins.sh
           # FIXME dirty carla leaves temp folders around
@@ -91,7 +93,8 @@ jobs:
         run: |
           echo "VERSION_TAG=$(echo ${{ github.event.pull_request.number || github.sha }} | cut -c1-8)" >> $GITHUB_ENV
       - name: Pack
-        if: steps.cache.outputs.cache-hit == 'true'
+        if: false
+        #if: steps.cache.outputs.cache-hit == 'true'
         run: |
           ./utils/linux/linux-tar.sh
           if [ "${{ env.VERSION_TAG }}" != "$(cat VERSION)" ]; then
@@ -168,11 +171,13 @@ jobs:
         run: |
           ./src/PawPaw/bootstrap-mod.sh linux-x86_64 && ./src/PawPaw/.cleanup.sh linux-x86_64
       - name: Build
-        if: steps.cache.outputs.cache-hit == 'true'
+        if: false
+        #if: steps.cache.outputs.cache-hit == 'true'
         run: |
           make DEBUG=1
       - name: Validate plugins
-        if: steps.cache.outputs.cache-hit == 'true'
+        if: false
+        #if: steps.cache.outputs.cache-hit == 'true'
         run: |
           ./utils/plugin-builder/validate-plugins.sh
           # FIXME dirty carla leaves temp folders around
@@ -186,7 +191,8 @@ jobs:
         run: |
           echo "VERSION_TAG=$(echo ${{ github.event.pull_request.number || github.sha }} | cut -c1-8)" >> $GITHUB_ENV
       - name: Pack
-        if: steps.cache.outputs.cache-hit == 'true'
+        if: false
+        #if: steps.cache.outputs.cache-hit == 'true'
         run: |
           ./utils/linux/linux-tar.sh
           if [ "${{ env.VERSION_TAG }}" != "$(cat VERSION)" ]; then
@@ -203,25 +209,23 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: macos-11
-            target: macos-10.15
-          - os: macos-11
-            target: macos-universal-10.15
           - os: macos-12
             target: macos-10.15
           - os: macos-12
             target: macos-universal-10.15
-          - os: macos-13
-            target: macos-10.15
-          - os: macos-13
-            target: macos-universal-10.15
+          # - os: macos-13
+          #   target: macos-10.15
+          # - os: macos-13
+          #   target: macos-universal-10.15
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Set up dependencies
         run: |
+          rm -f /usr/local/bin/2to3-3.11
+          brew uninstall azure-cli
           ./src/PawPaw/.github/workflows/bootstrap-deps.sh ${{ matrix.target }}
           brew install p7zip wget
       - name: Set up cache
@@ -235,13 +239,15 @@ jobs:
         run: |
           ./src/PawPaw/bootstrap-mod.sh ${{ matrix.target }} && ./src/PawPaw/.cleanup.sh ${{ matrix.target }}
       - name: Build
-        if: steps.cache.outputs.cache-hit == 'true'
+        if: false
+        #if: steps.cache.outputs.cache-hit == 'true'
         run: |
           make PAWPAW_TARGET=${{ matrix.target }}
       - name: Validate plugins
-        if: steps.cache.outputs.cache-hit == 'true'
+        if: false
+        #if: steps.cache.outputs.cache-hit == 'true'
         run: |
-          ./utils/plugin-builder/validate-plugins.sh ${{ matrix.target }}
+          # ./utils/plugin-builder/validate-plugins.sh ${{ matrix.target }}
           # FIXME dirty carla leaves temp folders around
           rm -rf *.tmp
       - name: Set version tag for release
@@ -254,6 +260,10 @@ jobs:
           echo "VERSION_TAG=$(echo ${{ github.event.pull_request.number || github.sha }} | cut -c1-8)" >> $GITHUB_ENV
       - name: Pack
         if: steps.cache.outputs.cache-hit == 'true'
+        env:
+          CODESIGN_IDENTITY: ${{ secrets.CODESIGN_IDENTITY }}
+          CODESIGN_P12_CONTENTS: ${{ secrets.CODESIGN_P12_CONTENTS }}
+          CODESIGN_P12_PASSWORD: ${{ secrets.CODESIGN_P12_PASSWORD }}
         run: |
           ./utils/macos/macos-pkg.sh ${{ matrix.target }}
           if [ "${{ env.VERSION_TAG }}" != "$(cat VERSION)" ]; then
@@ -308,11 +318,13 @@ jobs:
         run: |
           ./src/PawPaw/bootstrap-mod.sh win64 && ./src/PawPaw/.cleanup.sh win64
       - name: Build
-        if: steps.cache.outputs.cache-hit == 'true'
+        if: false
+        #if: steps.cache.outputs.cache-hit == 'true'
         run: |
           make win64
       - name: Validate plugins
-        if: steps.cache.outputs.cache-hit == 'true'
+        if: false
+        #if: steps.cache.outputs.cache-hit == 'true'
         run: |
           ./utils/plugin-builder/validate-plugins.sh
           # FIXME dirty carla leaves temp folders around
@@ -326,7 +338,8 @@ jobs:
         run: |
           echo "VERSION_TAG=$(echo ${{ github.event.pull_request.number || github.sha }} | cut -c1-8)" >> $GITHUB_ENV
       - name: Pack
-        if: steps.cache.outputs.cache-hit == 'true'
+        if: false
+        #if: steps.cache.outputs.cache-hit == 'true'
         run: |
           xvfb-run ./utils/win64/win64-installer.sh
           ./utils/win64/win64-zip.sh

utils/macos/macos-dmg.sh

@@ -0,0 +1,86 @@
+#!/bin/bash
+
+set -e
+
+if [ ! -d build ]; then
+  echo "Please run this script from the root folder"
+  exit
+fi
+
+if [ "$(uname -m)" = "x86_64" ] && [ x"${1}" != x"macos-universal-10.15" ]; then
+    PAWPAW_PREFIX="${HOME}/PawPawBuilds/targets/macos-10.15"
+else
+    PAWPAW_PREFIX="${HOME}/PawPawBuilds/targets/macos-universal-10.15"
+fi
+
+rm -rf build/dmg build/*.dmg
+rm -rf mod-ui/mod/__pycache__
+rm -rf mod-ui/mod/communication/__pycache__
+rm -rf mod-ui/modtools/__pycache__
+./utils/pack-html.sh
+
+# create dmg dir for placing patched app bundle inside
+mkdir build/dmg
+gcp -rL "build/mod-desktop.app" "build/dmg/MOD Desktop.app"
+
+# patch rpath for Qt libs and jack tools
+pushd "build/dmg/MOD Desktop.app/Contents"
+
+rm -rf Frameworks/*/*.prl
+rm -rf Frameworks/*/Headers
+rm -rf Frameworks/*/Versions
+rm -rf MacOS/data
+
+QTLIBS=("Core" "Gui" "OpenGL" "PrintSupport" "Svg" "Widgets")
+
+for f in $(ls Frameworks/*/Qt* PlugIns/*/libq*.dylib); do
+    for q in "${QTLIBS[@]}"; do
+        install_name_tool -change "@rpath/Qt${q}.framework/Versions/5/Qt${q}" "@executable_path/../Frameworks/Qt${q}.framework/Qt${q}" "${f}"
+    done
+done
+
+for f in $(ls MacOS/lib/libmod_utils.so MacOS/libjack*.dylib); do
+    install_name_tool -change "${PAWPAW_PREFIX}/lib/libjack.0.1.0.dylib" "@executable_path/libjack.0.dylib" "${f}"
+    install_name_tool -change "${PAWPAW_PREFIX}/lib/libjackserver.0.1.0.dylib" "@executable_path/libjackserver.0.dylib" "${f}"
+done
+
+for f in $(ls MacOS/jackd MacOS/jack/*.so); do
+    install_name_tool -change "${PAWPAW_PREFIX}/lib/libjack.0.1.0.dylib" "@executable_path/libjackserver.0.dylib" "${f}"
+    install_name_tool -change "${PAWPAW_PREFIX}/lib/libjackserver.0.1.0.dylib" "@executable_path/libjackserver.0.dylib" "${f}"
+done
+
+popd
+
+# sign app bundle
+if [ -n "${CODESIGN_IDENTITY}" ]; then
+    security create-keychain -p dummypassword build.keychain
+    security unlock-keychain -p dummypassword build.keychain
+
+    echo "${CODESIGN_P12_CONTENTS}" | base64 -D -o codesign.p12
+    security import codesign.p12 -f pkcs12 -P "${CODESIGN_P12_PASSWORD}" -k build.keychain -T /usr/bin/codesign
+    rm codesign.p12
+
+    # security add-trusted-cert -d -r trustRoot -k build.keychain xyz.cer
+
+    # security set-key-partition-list -S apple-tool:,apple: -k dummypassword build.keychain
+    #  -s apple-tool:,apple:,codesign:
+    # security list-keychains -d user -s build.keychain
+    # security list-keychains -d user -s build.keychain login.keychain
+    # security find-identity -p codesigning
+
+    codesign -s "${CODESIGN_IDENTITY}" --deep --force --verbose --option=runtime build/dmg/*.app
+fi
+
+# create dmg
+hdiutil create "mod-desktop-$(cat VERSION)-macOS.dmg" -srcfolder build/dmg -volname "MOD Desktop" -fs HFS+ -ov
+
+if [ -n "${CODESIGN_IDENTITY}" ]; then
+    codesign -s "${MACOS_APP_DEV_ID}" --force --verbose --option=runtime "mod-desktop-$(cat VERSION)-macOS.dmg"
+    security delete-keychain build.keychain
+fi
+
+# cleanup
+rm -rf build/dmg
+
+# xcrun notarytool store-credentials build-notary --apple-id xyz --team-id xyz --password xyz
+# xcrun notarytool submit choptones-amps-macOS.pkg --keychain-profile "build-notary" --wait

utils/macos/macos-pkg.sh

@@ -51,12 +51,35 @@ done
 
 popd
 
+# sign app bundle
+if [ -n "${CODESIGN_IDENTITY}" ]; then
+    security create-keychain -p dummypassword build.keychain
+    security unlock-keychain -p dummypassword build.keychain
+
+    echo "${CODESIGN_P12_CONTENTS}" | base64 -D -o codesign.p12
+    security import codesign.p12 -f pkcs12 -P "${CODESIGN_P12_PASSWORD}" -k build.keychain -T /usr/bin/codesign
+    rm codesign.p12
+
+    # security add-trusted-cert -d -r trustRoot -k build.keychain xyz.cer
+
+    # security set-key-partition-list -S apple-tool:,apple: -k dummypassword build.keychain
+    #  -s apple-tool:,apple:,codesign:
+    # security list-keychains -d user -s build.keychain
+    # security list-keychains -d user -s build.keychain login.keychain
+    # security find-identity -p codesigning
+
+    codesign -s "${CODESIGN_IDENTITY}" --deep --force --verbose --option=runtime "build/pkg/MOD Desktop.app"
+
+    PKG_SIGN_ARGS=(--sign "${CODESIGN_IDENTITY}")
+fi
+
 # create base app pkg
 pkgbuild \
   --identifier "audio.mod.desktop-app" \
   --component-plist "utils/macos/build.plist" \
   --install-location "/Applications/" \
   --root "${PWD}/build/pkg/" \
+  "${PKG_SIGN_ARGS[@]}" \
   build/mod-desktop.pkg
 
 # create final pkg
@@ -68,7 +91,11 @@ productbuild \
   --identifier "audio.mod.desktop-app" \
   --package-path "${PWD}/build" \
   --version 0 \
+  "${PKG_SIGN_ARGS[@]}" \
   mod-desktop-$(cat VERSION)-macOS.pkg
 
 # cleanup
 rm -rf build/pkg
+[ -n "${CODESIGN_IDENTITY}" ] && security delete-keychain build.keychain
+
+exit 0