Use new containers with Fedora 36, Mono 6.12.0.179, Xcode 13.3.1

Remove ad-hoc java install from Android build script, it's now included
in the build container.
This commit is contained in:
Rémi Verschelde
2022-05-24 10:37:35 +02:00
parent 6ebf52fda5
commit a0675bb238
5 changed files with 5 additions and 7 deletions

1
.gitignore vendored
View File

@@ -1,5 +1,6 @@
# User-specific configuration and signing key
config.sh
*.pfx
*.pkcs12
# Generated by build scripts

View File

@@ -14,9 +14,6 @@ mkdir godot
cd godot
tar xf /root/godot.tar.gz --strip-components=1
dnf install -y java-11-openjdk-devel
java --version
# Classical
if [ "${CLASSICAL}" == "1" ]; then

View File

@@ -11,7 +11,7 @@ export OPTIONS="production=yes use_lto=no"
export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes"
export TERM=xterm
export IOS_SDK="14.4"
export IOS_SDK="15.4"
export IOS_LIPO="/root/ioscross/arm64/bin/arm-apple-darwin11-lipo"
rm -rf godot

View File

@@ -5,11 +5,11 @@ set -e
# Config
export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
export OPTIONS="osxcross_sdk=darwin20.2 production=yes"
export OPTIONS="osxcross_sdk=darwin21.4 production=yes"
export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes"
export MONO_PREFIX_X86_64="/root/mono-installs/desktop-osx-x86_64-release"
export MONO_PREFIX_ARM64="/root/mono-installs/desktop-osx-arm64-release"
export STRIP="x86_64-apple-darwin20.2-strip -u -r"
export STRIP="x86_64-apple-darwin21.4-strip -u -r"
export TERM=xterm
rm -rf godot

View File

@@ -177,7 +177,7 @@ mkdir -p ${basedir}/out
mkdir -p ${basedir}/out/logs
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/"
export img_version=3.x-mono-6.12.0.158
export img_version=3.x-f36-mono-6.12.0.179
# Get AOT compilers from their containers.
mkdir -p ${basedir}/out/aot-compilers