Update build-macosx-amd64.yml

Roll back python compiler fixing
2025-11-28 02:49:22 +08:00 · 2024-01-16 10:49:50 +01:00 · 2024-01-16 10:39:09 +01:00 · 2024-01-16 10:36:10 +01:00 · 2024-01-16 10:30:44 +01:00 · 2023-12-19 13:50:27 +01:00
3 changed files with 16 additions and 12 deletions
--- 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: flyci-macos-large-latest-m1
    steps:
      - uses: actions/checkout@v3
      -
@@ -25,7 +25,7 @@ jobs:
      - name: Set up Java
        uses: actions/setup-java@v3
        with:
-          java-version: '8'
+          java-version: '11'
          distribution: 'adopt'
      - name: Install Apple certificate
        env:
@@ -40,7 +40,7 @@ jobs:
          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db

          # import certificate from secrets
-          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH
+          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH

          # create temporary keychain
          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
@@ -53,7 +53,7 @@ jobs:
          
          # import api key from secrets
          mkdir "${HOME}/private_keys"
-          echo -n "$APPLE_API_KEY_BASE64" | base64 --decode --output "${HOME}/private_keys/AuthKey_$APPLE_API_KEY_NAME.p8"
+          echo -n "$APPLE_API_KEY_BASE64" | base64 --decode -o "${HOME}/private_keys/AuthKey_$APPLE_API_KEY_NAME.p8"
      -
        name: Build
        run: |
--- a/8
+++ b/8
@@ -32,7 +32,7 @@ RUN ./run_linux.sh
 #Export built files
 FROM scratch AS export-stage
 COPY --from=stage /jcef/binary_distrib.tar.gz .
-COPY --from=stage /jcef/target target
-COPY --from=stage /jcef/third_party third_party
-COPY --from=stage /jcef/buildtools buildtools
-COPY --from=stage /jcef/jcef_build jcef_build
+#COPY --from=stage /jcef/target target
+#COPY --from=stage /jcef/third_party third_party
+#COPY --from=stage /jcef/buildtools buildtools
+#COPY --from=stage /jcef/jcef_build jcef_build
--- a/compile_linux.sh
+++ b/compile_linux.sh
@@ -70,9 +70,13 @@ if [ -f "out/buildtools/clang-format" ]; then
 fi

 #Move jcef_build
-rm -rf jcef/jcef_build
-mv out/jcef_build jcef/jcef_build
+if [ -f "out/jcef_build" ]; then
+    rm -rf jcef/jcef_build
+    mv out/jcef_build jcef/jcef_build
+fi

 #Move target to binary_distrib
-rm -rf jcef/binary_distrib
-mv out/target jcef/binary_distrib
+if [ -f "out/target" ]; then
+    rm -rf jcef/binary_distrib
+    mv out/target jcef/binary_distrib
+fi
Author	SHA1	Message	Date
Friwi	c48f8b02bd	Update build-macosx-amd64.yml	2024-01-16 10:49:50 +01:00
Friwi	243ac9c37d	Update build-macosx-amd64.yml	2024-01-16 10:39:09 +01:00
Friwi	af60c79e48	Roll back python compiler fixing	2024-01-16 10:36:10 +01:00
Friwi	39359a893e	Test flyci	2024-01-16 10:30:44 +01:00
Friwi	e4f8565721	Update install_macos_dependencies.sh	2023-12-19 13:50:27 +01:00
Friwi	be672489ad	Update install_macos_dependencies.sh	2023-12-19 11:24:22 +01:00
Friwi	ff5fc9020a	Update install_macos_dependencies.sh	2023-12-19 11:18:10 +01:00
Friwi	64bb73c837	Update install_macos_dependencies.sh	2023-12-19 11:13:22 +01:00
Friwi	47ff1bd3ea	Update install_macos_dependencies.sh	2023-12-14 12:09:27 +01:00
Friwi	e9aeb06788	Update install_macos_dependencies.sh	2023-12-14 12:03:25 +01:00
Friwi	cf017d26fe	Update install_macos_dependencies.sh	2023-12-14 12:00:15 +01:00
Friwi	3c775d3765	Update install_macos_dependencies.sh	2023-12-14 11:52:39 +01:00
Friwi	1a11a80d67	Update install_macos_dependencies.sh	2023-12-08 13:52:20 +01:00
Friwi	4cea794a99	Add six as dependency	2023-12-08 13:47:50 +01:00
Friwi	5b834e3e56	Update compile_macosx.sh	2023-12-08 13:47:04 +01:00
Friwi	93c173340a	Update compile_macosx.sh	2023-12-08 13:27:16 +01:00
Friwi	0bf27250e3	Check folder existence before moving	2023-10-06 13:20:21 +02:00
Friwi	b6c0abdd15	Only export binary distribution due to disk space of github runners	2023-10-06 12:39:52 +02:00