Upgrades (#128)

* Upgrade everything (WIP) * keeping up * cargo update * fix lint errors * Use stable version of egui 2.29 * set correct puffin version * fix default features * fix windows * fix windows * fix windows.. * upgrade the macos runner * cargo update * note about building in the readme * fix sdl input not being processed * clean up a comment * upgrade sdl * remove debug print * fix mac signing * fix
tedsteen · Nov 20, 2024 · 5130d38 · 5130d38
1 parent d640f83
commit 5130d38
Show file tree

Hide file tree

Showing 15 changed files with 1,606 additions and 1,210 deletions.
diff --git a/.github/workflows/bundle.yml b/.github/workflows/bundle.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         # NOTE: Should use the oldest available Ubuntu release, for maximum compatibility
-        os: [windows-latest, macOS-12, ubuntu-20.04]
+        os: [windows-latest, macOS-15, ubuntu-20.04]
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -103,33 +103,21 @@ jobs:
           mv target/release/nes-bundler $BINARIES_PATH/nes-bundler
         fi
 
-    - name: Import Certificates (macOS)
+    - uses: apple-actions/import-codesign-certs@v3
+      if: runner.os == 'macOS'
+      with: 
+        p12-file-base64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
+        p12-password: ${{ secrets.P12_PASSWORD }}
+
+    - name: Verify Certificate
       if: runner.os == 'macOS'
-      env:
-        BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
-        P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
       run: |
-        # create variables
-        CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
-        KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
-
-        # import certificate and provisioning profile from secrets
-        echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
-
-        # create temporary keychain
-        KEYCHAIN_PASSWORD=`openssl rand -hex 12`
-        security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
-        security default-keychain -s $KEYCHAIN_PATH
-        security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
-        security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
-
-        # import certificate to keychain
-        security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
-        security list-keychain -d user -s $KEYCHAIN_PATH
+        CERT_INFO=$(security find-identity -v -p codesigning signing_temp.keychain | grep "Developer ID Application")
+        APPLE_SIGNING_IDENTITY=$(echo "$CERT_INFO" | awk -F'"' '{print $2}')
+        echo "APPLE_SIGNING_IDENTITY=$APPLE_SIGNING_IDENTITY" >> $GITHUB_ENV
+        echo "Certificate imported."
 
     - name: Prepare Artifacts
-      env:
-        CODE_SIGN_IDENTITY: ${{ secrets.CODE_SIGN_IDENTITY }}
       run: |
         rm -rf artifacts || true
         mkdir artifacts
@@ -174,8 +162,8 @@ jobs:
           mv $BINARIES_PATH/nes-bundler-netplay "$NETPLAY_APP/Contents/MacOS/$BUNDLE_NAME"
           mv $BINARIES_PATH/nes-bundler         "$NON_NETPLAY_APP/Contents/MacOS/$BUNDLE_NAME"
           
-          codesign --force --options=runtime -s $CODE_SIGN_IDENTITY "$NETPLAY_APP/Contents/MacOS/$BUNDLE_NAME"
-          codesign --force --options=runtime -s $CODE_SIGN_IDENTITY "$NON_NETPLAY_APP/Contents/MacOS/$BUNDLE_NAME"
+          codesign --force --options=runtime -s "$APPLE_SIGNING_IDENTITY" "$NETPLAY_APP/Contents/MacOS/$BUNDLE_NAME"
+          codesign --force --options=runtime -s "$APPLE_SIGNING_IDENTITY" "$NON_NETPLAY_APP/Contents/MacOS/$BUNDLE_NAME"
 
           create-dmg \
             --volname "$BUNDLE_NAME Installer" \