Skip to content

Commit

Permalink
[CI] Update macos runners to macos-latest
Browse files Browse the repository at this point in the history
  • Loading branch information
Faless committed Oct 25, 2024
1 parent cb1ef2e commit 8d5ef9a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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",
},
Expand All @@ -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"]:
Expand Down

0 comments on commit 8d5ef9a

Please sign in to comment.