diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2024-10-25 16:06:59 +0200 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2024-10-25 17:03:29 +0200 |
| commit | ea8b37fe298c992c9809f72ec9879f773baf4c3d (patch) | |
| tree | bdbe3f9db84c164b22fdeebec7c5408e99a20c9e | |
| parent | cb1ef2e59c318856e7a9cd814c79486d0c26105a (diff) | |
| download | fork-godot-webrtc-native-ea8b37fe298c992c9809f72ec9879f773baf4c3d.tar.gz fork-godot-webrtc-native-ea8b37fe298c992c9809f72ec9879f773baf4c3d.tar.bz2 fork-godot-webrtc-native-ea8b37fe298c992c9809f72ec9879f773baf4c3d.zip | |
[CI] Update macos runners to macos-latest
| -rw-r--r-- | .github/workflows/build_release.yml | 6 | ||||
| -rw-r--r-- | SConstruct | 8 | ||||
| -rw-r--r-- | tools/openssl.py | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 2019105..1aa7d48 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -64,13 +64,13 @@ jobs: arch: 'x86_64' gdnative_flags: 'ios_arch=x86_64' sconsflags: 'ios_simulator=true' - os: 'macos-12' + os: 'macos-latest' cache-name: ios-x86_64-simulator - platform: ios arch: 'arm64' gdnative_flags: 'ios_arch=arm64' sconsflags: '' - os: 'macos-12' + os: 'macos-latest' cache-name: ios-arm64 # Linux @@ -108,7 +108,7 @@ jobs: arch: 'universal' gdnative_flags: 'macos_arch=universal bits=64' sconsflags: '' - os: 'macos-12' + os: 'macos-latest' cache-name: macos-universal # Windows @@ -41,7 +41,7 @@ opts.Update(env) # Minimum target platform versions. if "ios_min_version" not in ARGUMENTS: - ARGUMENTS["ios_min_version"] = "11.0" + ARGUMENTS["ios_min_version"] = "12.0" if "macos_deployment_target" not in ARGUMENTS: ARGUMENTS["macos_deployment_target"] = "11.0" if "android_api_level" not in ARGUMENTS: @@ -61,8 +61,8 @@ if env["godot_version"] == "3": replace_flags( cpp_env["CCFLAGS"], { - "-mios-simulator-version-min=10.0": "-mios-simulator-version-min=11.0", - "-miphoneos-version-min=10.0": "-miphoneos-version-min=11.0", + "-mios-simulator-version-min=10.0": "-mios-simulator-version-min=12.0", + "-miphoneos-version-min=10.0": "-miphoneos-version-min=12.0", "/std:c++14": "/std:c++17", "-std=c++14": "-std=c++17", }, @@ -82,7 +82,7 @@ if env["godot_version"] == "3": env["CC"] = "clang" # CC is not set in 3.x and can result in it being "gcc". if env["platform"] == "ios": - env["ios_min_version"] = "11.0" + env["ios_min_version"] = "12.0" # Normalize suffix if env["platform"] in ["windows", "linux"]: diff --git a/tools/openssl.py b/tools/openssl.py index 52a37d0..4312ff3 100644 --- a/tools/openssl.py +++ b/tools/openssl.py @@ -32,8 +32,8 @@ def ssl_platform_target(env): elif platform == "ios": if env["ios_simulator"]: targets = { - "x86_64": "iossimulator-xcrun", - "arm64": "iossimulator-xcrun", + "x86_64": "iossimulator-x86_64-xcrun", + "arm64": "iossimulator-arm64-xcrun", } else: targets = { |