Skip to content

Commit 81c1fa1

Browse files
authored
Merge pull request #54 from godotengine/img-f36-xcode13
Use new containers with Fedora 36, Mono 6.12.0.179, Xcode 13.3.1
2 parents 6ebf52f + a0675bb commit 81c1fa1

File tree

5 files changed

+5
-7
lines changed

5 files changed

+5
-7
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# User-specific configuration and signing key
22
config.sh
3+
*.pfx
34
*.pkcs12
45

56
# Generated by build scripts

build-android/build.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ mkdir godot
1414
cd godot
1515
tar xf /root/godot.tar.gz --strip-components=1
1616

17-
dnf install -y java-11-openjdk-devel
18-
java --version
19-
2017
# Classical
2118

2219
if [ "${CLASSICAL}" == "1" ]; then

build-ios/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export OPTIONS="production=yes use_lto=no"
1111
export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes"
1212
export TERM=xterm
1313

14-
export IOS_SDK="14.4"
14+
export IOS_SDK="15.4"
1515
export IOS_LIPO="/root/ioscross/arm64/bin/arm-apple-darwin11-lipo"
1616

1717
rm -rf godot

build-macosx/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ set -e
55
# Config
66

77
export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
8-
export OPTIONS="osxcross_sdk=darwin20.2 production=yes"
8+
export OPTIONS="osxcross_sdk=darwin21.4 production=yes"
99
export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes"
1010
export MONO_PREFIX_X86_64="/root/mono-installs/desktop-osx-x86_64-release"
1111
export MONO_PREFIX_ARM64="/root/mono-installs/desktop-osx-arm64-release"
12-
export STRIP="x86_64-apple-darwin20.2-strip -u -r"
12+
export STRIP="x86_64-apple-darwin21.4-strip -u -r"
1313
export TERM=xterm
1414

1515
rm -rf godot

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ mkdir -p ${basedir}/out
177177
mkdir -p ${basedir}/out/logs
178178

179179
export podman_run="${podman} run -it --rm --env BUILD_NAME --env GODOT_VERSION_STATUS --env NUM_CORES --env CLASSICAL=${build_classical} --env MONO=${build_mono} -v ${basedir}/godot-${godot_version}.tar.gz:/root/godot.tar.gz -v ${basedir}/mono-glue:/root/mono-glue -w /root/"
180-
export img_version=3.x-mono-6.12.0.158
180+
export img_version=3.x-f36-mono-6.12.0.179
181181

182182
# Get AOT compilers from their containers.
183183
mkdir -p ${basedir}/out/aot-compilers

0 commit comments

Comments
 (0)