Compare commits

...

15 Commits

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
2 changed files with 4 additions and 7 deletions

View File

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

View File

@@ -53,9 +53,6 @@ if [ ! -d "jcef_build" ]; then
fi
cd jcef_build
# Reinstall "six" python package to fix broken builds on amd64
pip install --ignore-installed six
# MacOS: Generate amd64/arm64 Makefiles.
if [ ${TARGETARCH} == 'amd64' ]; then
cmake -G "Ninja" -DPROJECT_ARCH="x86_64" -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ..