Update build-macosx-arm64.yml

Update build-macosx-amd64.yml
Update build-all.yml
2025-11-28 02:49:22 +08:00 · 2025-02-21 09:25:50 +01:00 · 2025-02-21 09:25:33 +01:00 · 2025-02-21 09:25:15 +01:00 · 2024-03-08 09:02:41 +01:00 · 2024-01-16 19:21:32 +01:00
5 changed files with 19 additions and 6 deletions
--- a/.github/workflows/build-all.yml
+++ b/.github/workflows/build-all.yml
@@ -191,7 +191,7 @@ jobs:


  build-macosx-amd64:
-    runs-on: macos-12
+    runs-on: macos-latest
    needs: create-release
    permissions:
      contents: write
@@ -207,6 +207,9 @@ jobs:
        with:
          java-version: '8'
          distribution: 'adopt'
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10.11'
      - name: Install Apple certificate
        env:
          BUILD_CERTIFICATE_BASE64: ${{ secrets.APPLE_BUILD_CERTIFICATE_BASE64 }}
@@ -258,7 +261,7 @@ jobs:


  build-macosx-arm64:
-    runs-on: macos-12
+    runs-on: macos-latest
    needs: create-release
    permissions:
      contents: write
@@ -274,6 +277,9 @@ jobs:
        with:
          java-version: '8'
          distribution: 'adopt'
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10.11'
      - name: Install Apple certificate
        env:
          BUILD_CERTIFICATE_BASE64: ${{ secrets.APPLE_BUILD_CERTIFICATE_BASE64 }}
--- a/.github/workflows/build-macosx-amd64.yml
+++ b/.github/workflows/build-macosx-amd64.yml
@@ -14,7 +14,7 @@ on:

 jobs:
  build-macosx-amd64:
-    runs-on: macos-12
+    runs-on: macos-latest
    steps:
      - uses: actions/checkout@v3
      -
@@ -27,6 +27,9 @@ jobs:
        with:
          java-version: '8'
          distribution: 'adopt'
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10.11'
      - name: Install Apple certificate
        env:
          BUILD_CERTIFICATE_BASE64: ${{ secrets.APPLE_BUILD_CERTIFICATE_BASE64 }}
--- a/.github/workflows/build-macosx-arm64.yml
+++ b/.github/workflows/build-macosx-arm64.yml
@@ -14,7 +14,7 @@ on:

 jobs:
  build-macosx-arm64:
-    runs-on: macos-12
+    runs-on: macos-latest
    steps:
      - uses: actions/checkout@v3
      -
@@ -27,6 +27,9 @@ jobs:
        with:
          java-version: '8'
          distribution: 'adopt'
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10.11'
      - name: Install Apple certificate
        env:
          BUILD_CERTIFICATE_BASE64: ${{ secrets.APPLE_BUILD_CERTIFICATE_BASE64 }}
--- a/macosx_codesign.sh
+++ b/macosx_codesign.sh
@@ -28,6 +28,7 @@ chmod +x macosx_codesign_zip.sh

 #Sign helpers
 echo "Signing helpers..."
+cd "$( dirname "$0" )"
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_HELPER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper.app"
 bash macosx_notarize.sh "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper.app" "$2" $3 org.jcef.jcef.helper $4 $5 $6
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_HELPER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper (GPU).app"
@@ -44,8 +45,8 @@ echo "Signing libraries and framework..."
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/$FRAMEWORK_NAME/Libraries/libEGL.dylib"
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/$FRAMEWORK_NAME/Libraries/libGLESv2.dylib"
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/$FRAMEWORK_NAME/Libraries/libvk_swiftshader.dylib"
+codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/$FRAMEWORK_NAME/Chromium Embedded Framework"
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/$FRAMEWORK_NAME"
-bash macosx_notarize.sh "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/$FRAMEWORK_NAME" "$2" $3 org.cef.framework $4 $5 $6
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/Contents/Java/libjcef.dylib"
 bash macosx_codesign_zip.sh "$APP_DIR/$APP_NAME/Contents/Java/gluegen-rt-natives-macosx-universal.jar" "natives/macosx-universal/libgluegen_rt.dylib" "$2"
 bash macosx_codesign_zip.sh "$APP_DIR/$APP_NAME/Contents/Java/jogl-all-natives-macosx-universal.jar" "natives/macosx-universal/libnativewindow_awt.dylib" "$2"
--- a/scripts/install_macos_dependencies.sh
+++ b/scripts/install_macos_dependencies.sh
@@ -1,6 +1,6 @@
 #!/bin/bash

-PYTHON=/usr/local/Frameworks/Python.framework/Versions/3.12/bin/python3.12
+PYTHON=python3

 brew install ninja
 "$PYTHON" -m pip install --ignore-installed six
Author	SHA1	Message	Date
Friwi	56cec2a924	Update build-macosx-arm64.yml	2025-02-21 09:25:50 +01:00
Friwi	fbf1c72932	Update build-macosx-amd64.yml	2025-02-21 09:25:33 +01:00
Friwi	a668fd9368	Update build-all.yml	2025-02-21 09:25:15 +01:00
Friwi	72331273d2	No longer notarize the framework	2024-03-08 09:02:41 +01:00
Friwi	ff30b8d44f	Update macosx_codesign.sh	2024-01-16 19:21:32 +01:00
Friwi	ea8fdd910f	Update macosx_notarize.sh	2024-01-16 19:07:35 +01:00
Friwi	e4cf9046f6	Update macosx_notarize.sh	2024-01-16 18:35:17 +01:00
Friwi	af9b8de088	Update macosx_notarize.sh	2024-01-16 18:23:48 +01:00
Friwi	5c2aed1e6e	Rollback	2024-01-16 18:21:34 +01:00
Friwi	1b6ca87f95	Update macosx_codesign.sh	2024-01-16 18:05:14 +01:00
Friwi	2791e80fbd	Update macosx_codesign.sh	2024-01-16 17:25:28 +01:00
Friwi	69fe5607fe	Update macosx_codesign.sh	2024-01-16 17:16:37 +01:00
Friwi	da859aba74	Update macosx_notarize.sh	2024-01-16 17:13:39 +01:00
Friwi	2a837a2972	Update macosx_notarize.sh	2024-01-16 17:03:25 +01:00
Friwi	0d81f8bb0e	Update macosx_notarize.sh	2024-01-16 16:50:08 +01:00
Friwi	ac6e95a0fe	Update macosx_codesign.sh	2024-01-16 16:46:13 +01:00
Friwi	8209cae757	Update macosx_codesign.sh	2024-01-16 16:33:17 +01:00
Friwi	ca106fb3d4	Add bogus dir so staple action works again?	2024-01-16 16:18:24 +01:00
Friwi	4b0b6038f5	Update build-all.yml	2024-01-16 15:55:39 +01:00
Friwi	76603285f2	Update build-macosx-arm64.yml	2024-01-16 15:55:01 +01:00
Friwi	2c2aad9a15	Update install_macos_dependencies.sh	2024-01-16 15:51:53 +01:00
Friwi	337fe4679d	Update build-macosx-amd64.yml	2024-01-16 15:51:28 +01:00