Update build-macosx-amd64.yml

.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: |

DockerfileLinux

@@ -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/target target
-COPY --from=stage /jcef/third_party third_party
+#COPY --from=stage /jcef/third_party third_party
-COPY --from=stage /jcef/buildtools buildtools
+#COPY --from=stage /jcef/buildtools buildtools
-COPY --from=stage /jcef/jcef_build jcef_build
+#COPY --from=stage /jcef/jcef_build jcef_build

compile_linux.sh

@@ -70,9 +70,13 @@ if [ -f "out/buildtools/clang-format" ]; then
 fi
 
 #Move jcef_build
-rm -rf jcef/jcef_build
+if [ -f "out/jcef_build" ]; then
-mv out/jcef_build jcef/jcef_build
+    rm -rf jcef/jcef_build
+    mv out/jcef_build jcef/jcef_build
+fi
 
 #Move target to binary_distrib
-rm -rf jcef/binary_distrib
+if [ -f "out/target" ]; then
-mv out/target jcef/binary_distrib
+    rm -rf jcef/binary_distrib
+    mv out/target jcef/binary_distrib
+fi