Port Bemol to macOS and AppKit

.github/workflows/upload-to-testflight.yml → .github/workflows/publish_ios_app.yml

@@ -1,14 +1,18 @@
-name: Upload to TestFlight
+name: Publish iOS App
 on:
   push:
     branches:
       - main
+    paths:
+      - Shared/**
+      - iOS/**
 env:
-  DEVELOPER_DIR: /Applications/Xcode_16.2.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_26.5.app/Contents/Developer
 
 jobs:
-  upload:
-    runs-on: macos-15-large
+  make:
+    if: false
+    runs-on: macos-26-large
     steps:
     - uses: actions/checkout@v4
       with:
@@ -17,17 +21,17 @@ jobs:
 
     - name: Load cached sound font
       id: load-cached-sound-font
-      uses: actions/cache@v4
+      uses: actions/cache@v6
       with:
         key: sound_font
-        path: ./Bemol/Resources/sound_font.sf2
+        path: ./Shared/Resources/sound_font.sf2
 
     - if: ${{ steps.load-cached-sound-font.outputs.cache-hit != 'true' }}
       name: Download sound font
       env:
         SOUND_FONT_URL: ${{ secrets.SOUND_FONT_URL }}
       run: |
-        curl -L -o ./Bemol/Resources/sound_font.sf2 ${SOUND_FONT_URL}
+        curl -L -o ./Shared/Resources/sound_font.sf2 ${SOUND_FONT_URL}
 
     - name: Set up the development team
       env:
@@ -41,20 +45,20 @@ jobs:
         APP_STORE_CONNECT_API_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY }}
         APP_STORE_CONNECT_API_KEY_CONTENTS: ${{ secrets.APP_STORE_CONNECT_API_KEY_CONTENTS }}
       run: |
-        mkdir ./private_keys
+        mkdir ./iOS/private_keys
         echo -e "$APP_STORE_CONNECT_API_KEY_CONTENTS" > ./private_keys/AuthKey_${APP_STORE_CONNECT_API_KEY}.p8
 
     - name: Install the Apple certificates
       # https://docs.github.com/en/actions/deployment/deploying-xcode-applications/installing-an-apple-certificate-on-macos-runners-for-xcode-development
       env:
-        DEVELOPMENT_CERTIFICATE: ${{ secrets.DEVELOPMENT_CERTIFICATE }}
-        DEVELOPMENT_CERTIFICATE_PASSPHRASE: ${{ secrets.DEVELOPMENT_CERTIFICATE_PASSPHRASE }}
-        DISTRIBUTION_CERTIFICATE: ${{ secrets.DISTRIBUTION_CERTIFICATE }}
-        DISTRIBUTION_CERTIFICATE_PASSPHRASE: ${{ secrets.DISTRIBUTION_CERTIFICATE_PASSPHRASE }}
+        DEVELOPMENT_CERTIFICATE: ${{ secrets.IOS_DEVELOPMENT_CERTIFICATE }}
+        DEVELOPMENT_CERTIFICATE_PASSPHRASE: ${{ secrets.IOS_DEVELOPMENT_CERTIFICATE_PASSPHRASE }}
+        DISTRIBUTION_CERTIFICATE: ${{ secrets.IOS_DISTRIBUTION_CERTIFICATE }}
+        DISTRIBUTION_CERTIFICATE_PASSPHRASE: ${{ secrets.IOS_DISTRIBUTION_CERTIFICATE_PASSPHRASE }}
         KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
       run: |
-        development_certificate=$RUNNER_TEMP/BemolDevelopmentCertificate.p12
-        distribution_certificate=$RUNNER_TEMP/BemolDistributionCertificate.p12
+        development_certificate=$RUNNER_TEMP/BemolIOSDevelopmentCertificate.p12
+        distribution_certificate=$RUNNER_TEMP/BemolIOSDistributionCertificate.p12
         keychain_path=$RUNNER_TEMP/certificates.keychain-db
 
         echo -n "$DEVELOPMENT_CERTIFICATE" | base64 --decode -o $development_certificate
@@ -78,10 +82,10 @@ jobs:
       run: |
         chmod +x ./Scripts/next_marketing_version.sh
         chmod +x ./Scripts/next_build_version.sh
-        chmod +x ./Scripts/upload_to_testflight.sh
+        chmod +x ./Scripts/make_ios_app.sh
         marketing_version=`./Scripts/next_marketing_version.sh`
         build_version=`./Scripts/next_build_version.sh`
-        ./Scripts/upload_to_testflight.sh $marketing_version $build_version
+        ./Scripts/make_ios_app.sh $marketing_version $build_version
         echo "TAG_NAME=$marketing_version" >> "$GITHUB_OUTPUT"
 
     - name: Create tag

.github/workflows/publish_macos_app.yml

@@ -0,0 +1,110 @@
+name: Publish macOS App
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - Shared/**
+      - macOS/**
+env:
+  DEVELOPER_DIR: /Applications/Xcode_26.5.app/Contents/Developer
+
+jobs:
+  make:
+    runs-on: macos-26-large
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        ref: main
+
+    - name: Load cached sound font
+      id: load-cached-sound-font
+      uses: actions/cache@v6
+      with:
+        key: sound_font
+        path: ./Shared/Resources/sound_font.sf2
+
+    - if: ${{ steps.load-cached-sound-font.outputs.cache-hit != 'true' }}
+      name: Download sound font
+      env:
+        SOUND_FONT_URL: ${{ secrets.SOUND_FONT_URL }}
+      run: |
+        curl -L -o ./Shared/Resources/sound_font.sf2 ${SOUND_FONT_URL}
+
+    - name: Set up code signing
+      env:
+        DEVELOPMENT_TEAM: ${{ secrets.DEVELOPMENT_TEAM }}
+      run: |
+        configuration="CODE_SIGN_IDENTITY = Developer ID Application;\nDEVELOPMENT_TEAM = ${DEVELOPMENT_TEAM};\nCODE_SIGN_STYLE = Manual;\n"
+        echo -e "$configuration" > ./Configurations/Signing.xcconfig
+
+    - name: Install the App Store Connect API key
+      env:
+        APP_STORE_CONNECT_API_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY }}
+        APP_STORE_CONNECT_API_KEY_CONTENTS: ${{ secrets.APP_STORE_CONNECT_API_KEY_CONTENTS }}
+      run: |
+        mkdir ./macOS/private_keys
+        echo -e "$APP_STORE_CONNECT_API_KEY_CONTENTS" > ./private_keys/AuthKey_${APP_STORE_CONNECT_API_KEY}.p8
+
+    - name: Install the Apple certificates
+      # https://docs.github.com/en/actions/deployment/deploying-xcode-applications/installing-an-apple-certificate-on-macos-runners-for-xcode-development
+      env:
+        DISTRIBUTION_CERTIFICATE: ${{ secrets.MACOS_DEVELOPER_ID_APPLICATION_CERTIFICATE }}
+        DISTRIBUTION_CERTIFICATE_PASSPHRASE: ${{ secrets.MACOS_DEVELOPER_ID_APPLICATION_CERTIFICATE_PASSPHRASE }}
+        KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+      run: |
+        distribution_certificate=$RUNNER_TEMP/BemolDeveloperIDApplicationCertificate.p12
+        keychain_path=$RUNNER_TEMP/certificates.keychain-db
+
+        echo -n "$DISTRIBUTION_CERTIFICATE" | base64 --decode -o $distribution_certificate
+
+        security create-keychain -p "$KEYCHAIN_PASSWORD" $keychain_path
+        security set-keychain-settings -lut 21600 $keychain_path
+        security unlock-keychain -p "$KEYCHAIN_PASSWORD" $keychain_path
+
+        security import $distribution_certificate -P "$DISTRIBUTION_CERTIFICATE_PASSPHRASE" -A -t cert -f pkcs12 -k $keychain_path
+
+        security list-keychain -d user -s $keychain_path
+
+    - name: Archive and notarize
+      id: archive-and-notarize
+      env:
+        APP_STORE_CONNECT_API_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY }}
+        APP_STORE_CONNECT_API_ISSUER: ${{ secrets.APP_STORE_CONNECT_API_ISSUER }}
+      run: |
+        chmod +x ./Scripts/next_marketing_version.sh
+        chmod +x ./Scripts/next_build_version.sh
+        chmod +x ./Scripts/make_macos_app.sh
+        marketing_version=`./Scripts/next_marketing_version.sh`
+        build_version=`./Scripts/next_build_version.sh`
+        ./Scripts/make_macos_app.sh $marketing_version $build_version
+        echo "TAG_NAME=$marketing_version" >> "$GITHUB_OUTPUT"
+
+    - name: Upload 
+      id: upload
+      uses: actions/upload-artifact@v7
+      with:
+        name: "Bemol-${{ steps.archive-and-notarize.outputs.TAG_NAME }}"
+        path: |
+          ./Artifacts/macOS/Bemol.zip
+          ./Artifacts/macOS/NotarizationResponse.plist
+        if-no-files-found: error
+        overwrite: true
+
+    - name: Create tag
+      uses: actions/github-script@v7
+      with:
+        github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
+        script: |
+          github.rest.git.createRef({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            ref: `refs/tags/${{ steps.archive-and-notarize.outputs.TAG_NAME }}`,
+            sha: context.sha
+          })
+
+    - name: Clean up
+      run: |
+        rm -rf ./macOS/private_keys
+        security delete-keychain $RUNNER_TEMP/certificates.keychain-db

.github/workflows/run-tests.yml

@@ -2,12 +2,14 @@ name: Test
 on:
   pull_request:
     branches: [ main, develop ]
+    paths:
+      - Shared/**
 env:
-  DEVELOPER_DIR: /Applications/Xcode_16.2.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_26.5.app/Contents/Developer
 
 jobs:
   test:
-    runs-on: macos-15-large
+    runs-on: macos-26-large
     steps:
     - uses: actions/checkout@v4
 
@@ -16,15 +18,29 @@ jobs:
         DEVELOPMENT_TEAM: ${{ secrets.DEVELOPMENT_TEAM }}
       run: |
         configuration="CODE_SIGN_STYLE = Automatic\nDEVELOPMENT_TEAM = ${DEVELOPMENT_TEAM}\n"
-        echo -e "$configuration" > ./Configurations/Signing.xcconfig
+        echo -e "$configuration" > ./macOS/Configurations/Signing.xcconfig
+
+    - name: Load cached sound font
+      id: load-cached-sound-font
+      uses: actions/cache@v6
+      with:
+        key: sound_font
+        path: ./Shared/Resources/sound_font.sf2
+
+    - if: ${{ steps.load-cached-sound-font.outputs.cache-hit != 'true' }}
+      name: Download sound font
+      env:
+        SOUND_FONT_URL: ${{ secrets.SOUND_FONT_URL }}
+      run: |
+        curl -L -o ./Shared/Resources/sound_font.sf2 ${SOUND_FONT_URL}
 
     - name: Run tests
       run: |
         chmod +x ./Scripts/test.sh
         ./Scripts/test.sh
 
     - name: Publish test results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: test-results.xcresult
-        path: ./Artifacts/test-results.xcresult
+        path: ./Artifacts/Tests/test-results.xcresult

.gitignore

@@ -2,8 +2,10 @@
 */xcshareddata/IDEWorkspaceChecks.plist
 xcuserdata/
 Artifacts/
-private_keys/
-Certificates/
-Configurations/Signing.xcconfig
-Bemol/Resources/sound_font.sf2
-Screenshots/
+iOS/private_keys/
+iOS/Certificates/
+iOS/Configurations/Signing.xcconfig
+macOS/private_keys/
+macOS/Certificates/
+macOS/Configurations/Signing.xcconfig
+Shared/Resources/sound_font.sf2