Windows: Use osslsigncode from PATH for signing

We were shipping a pre-built version but it only works on specific distros as it's tightly coupled to openssl. When upgrading from F34 to F35 it started segfaulting. We now rely on the version packaged by Fedora which should be installed on the host, or compiled and installed manually in PATH by users. (cherry picked from commit 8adfdd068e)
Add check to prevent mistakes with templates version
2025-12-31 05:48:35 +03:00 · 2022-08-01 22:09:09 +02:00 · 2022-07-18 16:09:19 +02:00
15 changed files with 138 additions and 505 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
-# User-specific configuration and signing keys
+# User-specific configuration and signing key
 config.sh
-*.jks
 *.pfx
 *.pkcs12

--- a/build-android/build.sh
+++ b/build-android/build.sh
@@ -14,45 +14,14 @@ mkdir godot
 cd godot
 tar xf /root/godot.tar.gz --strip-components=1

-# Environment variables and keystore needed for signing store editor build,
-# as well as signing and publishing to MavenCentral.
-source /root/keystore/config.sh
-
-store_release="yes"
-if [ -z "${GODOT_ANDROID_SIGN_KEYSTORE}" ]; then
-  echo "No keystore provided to sign the Android release editor build, using debug build instead."
-  store_release="no"
-fi
+dnf install -y java-11-openjdk-devel
+java --version

 # Classical

 if [ "${CLASSICAL}" == "1" ]; then
  echo "Starting classical build for Android..."

-  $SCONS platform=android android_arch=armv7 $OPTIONS tools=yes target=release_debug store_release=$store_release
-  $SCONS platform=android android_arch=arm64v8 $OPTIONS tools=yes target=release_debug store_release=$store_release
-  $SCONS platform=android android_arch=x86 $OPTIONS tools=yes target=release_debug store_release=$store_release
-  $SCONS platform=android android_arch=x86_64 $OPTIONS tools=yes target=release_debug store_release=$store_release
-
-  pushd platform/android/java
-  ./gradlew generateGodotEditor
-  popd
-
-  mkdir -p /root/out/tools
-  # Copy the generated Android editor binaries (apk & aab).
-  if [ "$store_release" == "yes" ]; then
-    cp bin/android_editor_builds/android_editor-release.apk /root/out/tools/android_editor.apk
-    cp bin/android_editor_builds/android_editor-release.aab /root/out/tools/android_editor.aab
-  else
-    cp bin/android_editor_builds/android_editor-debug.apk /root/out/tools/android_editor.apk
-    cp bin/android_editor_builds/android_editor-debug.aab /root/out/tools/android_editor.aab
-  fi
-
-  # Restart from a clean tarball, as we'll copy all the contents
-  # outside the container for the MavenCentral upload.
-  rm -rf /root/godot/*
-  tar xf /root/godot.tar.gz --strip-components=1
-
  $SCONS platform=android android_arch=armv7 $OPTIONS tools=no target=release_debug
  $SCONS platform=android android_arch=armv7 $OPTIONS tools=no target=release

@@ -67,21 +36,13 @@ if [ "${CLASSICAL}" == "1" ]; then

  pushd platform/android/java
  ./gradlew generateGodotTemplates
-
-  if [ "$store_release" == "yes" ]; then
-    # Copy source folder with compiled libs so we can optionally use it
-    # in a separate script to upload the templates to MavenCentral.
-    cp -r /root/godot /root/out/source/
-    # Backup ~/.gradle too so we can reuse all the downloaded stuff.
-    cp -r /root/.gradle /root/out/source/.gradle
-  fi
  popd

  mkdir -p /root/out/templates
-  cp bin/android_source.zip /root/out/templates/
-  cp bin/android_debug.apk /root/out/templates/
-  cp bin/android_release.apk /root/out/templates/
-  cp bin/godot-lib.release.aar /root/out/templates/
+  cp bin/android_source.zip /root/out/templates
+  cp bin/android_debug.apk /root/out/templates/android_debug.apk
+  cp bin/android_release.apk /root/out/templates/android_release.apk
+  cp bin/godot-lib.release.aar /root/out/templates/godot-lib.release.aar
 fi

 # Mono
@@ -91,12 +52,13 @@ if [ "${MONO}" == "1" ]; then

  cp /root/mono-glue/*.cpp modules/mono/glue/
  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
+  cp -r /root/mono-glue/GodotSharp/GodotSharpEditor/Generated modules/mono/glue/GodotSharp/GodotSharpEditor/

-  $SCONS platform=android android_arch=armv7 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-armv7-release tools=no target=release_debug
-  $SCONS platform=android android_arch=armv7 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-armv7-release tools=no target=release
+  $SCONS platform=android android_arch=armv7 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-armeabi-v7a-release tools=no target=release_debug
+  $SCONS platform=android android_arch=armv7 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-armeabi-v7a-release tools=no target=release

-  $SCONS platform=android android_arch=arm64v8 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-arm64v8-release tools=no target=release_debug
-  $SCONS platform=android android_arch=arm64v8 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-arm64v8-release tools=no target=release
+  $SCONS platform=android android_arch=arm64v8 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-arm64-v8a-release tools=no target=release_debug
+  $SCONS platform=android android_arch=arm64v8 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-arm64-v8a-release tools=no target=release

  $SCONS platform=android android_arch=x86 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-x86-release tools=no target=release_debug
  $SCONS platform=android android_arch=x86 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-x86-release tools=no target=release
@@ -109,10 +71,10 @@ if [ "${MONO}" == "1" ]; then
  popd

  mkdir -p /root/out/templates-mono
-  cp bin/android_source.zip /root/out/templates-mono/
-  cp bin/android_debug.apk /root/out/templates-mono/
-  cp bin/android_release.apk /root/out/templates-mono/
-  cp bin/godot-lib.release.aar /root/out/templates-mono/
+  cp bin/android_source.zip /root/out/templates-mono
+  cp bin/android_debug.apk /root/out/templates-mono/android_debug.apk
+  cp bin/android_release.apk /root/out/templates-mono/android_release.apk
+  cp bin/godot-lib.release.aar /root/out/templates-mono/godot-lib.release.aar

  mkdir -p /root/out/templates-mono/bcl
  cp -r /root/mono-installs/android-bcl/* /root/out/templates-mono/bcl/
--- a/build-android/upload-mavencentral.sh
+++ b/build-android/upload-mavencentral.sh
@@ -1,18 +0,0 @@
-#/bin/bash
-
-basedir="$(pwd)"
-
-if [ ! -d "${basedir}/deps/keystore" ]; then
-  echo "Couldn't find ${basedir}/deps/keystore. Make sure to run this from the root folder of the Git repository."
-fi
-
-source ${basedir}/deps/keystore/config.sh
-
-# Release the Godot Android library to MavenCentral
-${PODMAN} run -it --rm \
-  -v ${basedir}/out/android/source:/root/godot -v ${basedir}/deps/keystore:/root/keystore \
-  localhost/godot-android:${IMAGE_VERSION} bash -c \
-    "source /root/keystore/config.sh && \
-    cp -r /root/godot/.gradle /root && \
-    cd /root/godot/platform/android/java && \
-    ./gradlew publishTemplateReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository"
--- a/build-ios/build.sh
+++ b/build-ios/build.sh
@@ -7,11 +7,11 @@ set -e
 export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
 # Keep LTO disabled for iOS - it works but it makes linking apps on deploy very slow,
 # which is seen as a regression in the current workflow.
-export OPTIONS="production=yes lto=none"
+export OPTIONS="production=yes use_lto=no"
 export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes"
 export TERM=xterm

-export IOS_SDK="18.2"
+export IOS_SDK="14.4"
 export IOS_LIPO="/root/ioscross/arm64/bin/arm-apple-darwin11-lipo"

 rm -rf godot
@@ -34,15 +34,15 @@ if [ "${CLASSICAL}" == "1" ]; then
  # Disabled for now as it doesn't work with cctools-port and current LLVM.
  # See https://github.com/godotengine/build-containers/pull/85.
  #$SCONS platform=iphone $OPTIONS arch=arm64 tools=no ios_simulator=yes target=release_debug \
-  #  IPHONESDK="/root/ioscross/arm64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
+  #  IPHONESDK="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
  #$SCONS platform=iphone $OPTIONS arch=arm64 tools=no ios_simulator=no target=release \
-  #  IPHONESDK="/root/ioscross/arm64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
+  #  IPHONESDK="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"

  # x86_64 simulator
  $SCONS platform=iphone $OPTIONS arch=x86_64 tools=no ios_simulator=yes target=release_debug \
-    IPHONESDK="/root/ioscross/x86_64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
+    IPHONESDK="/root/ioscross/x86_64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
  $SCONS platform=iphone $OPTIONS arch=x86_64 tools=no ios_simulator=yes target=release \
-    IPHONESDK="/root/ioscross/x86_64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
+    IPHONESDK="/root/ioscross/x86_64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"

  mkdir -p /root/out/templates
  cp bin/libgodot.iphone.opt.arm64.a /root/out/templates/libgodot.iphone.a
@@ -72,15 +72,15 @@ if [ "${MONO}" == "1" ]; then
  # Disabled for now as it doesn't work with cctools-port and current LLVM.
  # See https://github.com/godotengine/build-containers/pull/85.
  #$SCONS platform=iphone $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=yes mono_prefix=/root/mono-installs/ios-arm64-sim-release tools=no target=release_debug \
-  #  IPHONESDK="/root/ioscross/arm64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
+  #  IPHONESDK="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
  #$SCONS platform=iphone $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=yes mono_prefix=/root/mono-installs/ios-arm64-sim-release tools=no target=release \
-  #  IPHONESDK="/root/ioscross/arm64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
+  #  IPHONESDK="/root/ioscross/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"

  # x86_64 simulator
  $SCONS platform=iphone $OPTIONS $OPTIONS_MONO arch=x86_64 ios_simulator=yes mono_prefix=/root/mono-installs/ios-x86_64-release tools=no target=release_debug \
-    IPHONESDK="/root/ioscross/x86_64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
+    IPHONESDK="/root/ioscross/x86_64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
  $SCONS platform=iphone $OPTIONS $OPTIONS_MONO arch=x86_64 ios_simulator=yes mono_prefix=/root/mono-installs/ios-x86_64-release tools=no target=release \
-    IPHONESDK="/root/ioscross/x86_64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
+    IPHONESDK="/root/ioscross/x86_64_sim/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"

  mkdir -p /root/out/templates-mono

--- a/build-javascript/build.sh
+++ b/build-javascript/build.sh
@@ -6,7 +6,7 @@ set -e

 export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
 export OPTIONS="production=yes"
-export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes mono_prefix=/root/mono-installs/wasm-runtime-release lto=none"
+export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes mono_prefix=/root/mono-installs/wasm-runtime-release use_lto=no"
 export TERM=xterm

 rm -rf godot
--- a/build-linux/build.sh
+++ b/build-linux/build.sh
@@ -5,7 +5,7 @@ set -e
 # Config

 export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS="production=yes LINKFLAGS=-s"
+export OPTIONS="production=yes"
 export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes"
 export MONO_PREFIX_X86_64="/root/mono-installs/desktop-linux-x86_64-release"
 export MONO_PREFIX_X86="/root/mono-installs/desktop-linux-x86-release"
@@ -34,44 +34,18 @@ if [ "${CLASSICAL}" == "1" ]; then
  cp -rvp bin/* /root/out/x64/templates
  rm -rf bin

-  export PATH="${GODOT_SDK_LINUX_X86_32}/bin:${BASE_PATH}"
+  export PATH="${GODOT_SDK_LINUX_X86}/bin:${BASE_PATH}"

-  $SCONS platform=x11 bits=32 $OPTIONS tools=yes target=release_debug
+  $SCONS platform=x11 $OPTIONS tools=yes target=release_debug bits=32
  mkdir -p /root/out/x86/tools
  cp -rvp bin/* /root/out/x86/tools
  rm -rf bin

-  $SCONS platform=x11 bits=32 $OPTIONS tools=no target=release_debug
-  $SCONS platform=x11 bits=32 $OPTIONS tools=no target=release
+  $SCONS platform=x11 $OPTIONS tools=no target=release_debug bits=32
+  $SCONS platform=x11 $OPTIONS tools=no target=release bits=32
  mkdir -p /root/out/x86/templates
  cp -rvp bin/* /root/out/x86/templates
  rm -rf bin
-
-  export PATH="${GODOT_SDK_LINUX_ARM64}/bin:${BASE_PATH}"
-
-  $SCONS platform=x11 arch=arm64 $OPTIONS tools=yes target=release_debug
-  mkdir -p /root/out/arm64/tools
-  cp -rvp bin/* /root/out/arm64/tools
-  rm -rf bin
-
-  $SCONS platform=x11 arch=arm64 $OPTIONS tools=no target=release_debug
-  $SCONS platform=x11 arch=arm64 $OPTIONS tools=no target=release
-  mkdir -p /root/out/arm64/templates
-  cp -rvp bin/* /root/out/arm64/templates
-  rm -rf bin
-
-  export PATH="${GODOT_SDK_LINUX_ARM32}/bin:${BASE_PATH}"
-
-  $SCONS platform=x11 arch=arm $OPTIONS tools=yes target=release_debug
-  mkdir -p /root/out/arm/tools
-  cp -rvp bin/* /root/out/arm/tools
-  rm -rf bin
-
-  $SCONS platform=x11 arch=arm $OPTIONS tools=no target=release_debug
-  $SCONS platform=x11 arch=arm $OPTIONS tools=no target=release
-  mkdir -p /root/out/arm/templates
-  cp -rvp bin/* /root/out/arm/templates
-  rm -rf bin
 fi

 # Mono
@@ -97,16 +71,16 @@ if [ "${MONO}" == "1" ]; then
  cp -rvp bin/* /root/out/x64/templates-mono
  rm -rf bin

-  export PATH="${GODOT_SDK_LINUX_X86_32}/bin:${BASE_PATH}"
+  export PATH="${GODOT_SDK_LINUX_X86}/bin:${BASE_PATH}"
  export OPTIONS_MONO_PREFIX="${OPTIONS} ${OPTIONS_MONO} mono_prefix=${MONO_PREFIX_X86}"

-  $SCONS platform=x11 bits=32 $OPTIONS_MONO_PREFIX tools=yes target=release_debug copy_mono_root=yes
+  $SCONS platform=x11 $OPTIONS_MONO_PREFIX tools=yes target=release_debug copy_mono_root=yes bits=32
  mkdir -p /root/out/x86/tools-mono
  cp -rvp bin/* /root/out/x86/tools-mono
  rm -rf bin

-  $SCONS platform=x11 bits=32 $OPTIONS_MONO_PREFIX tools=no target=release_debug
-  $SCONS platform=x11 bits=32 $OPTIONS_MONO_PREFIX tools=no target=release
+  $SCONS platform=x11 $OPTIONS_MONO_PREFIX tools=no target=release_debug bits=32
+  $SCONS platform=x11 $OPTIONS_MONO_PREFIX tools=no target=release bits=32
  mkdir -p /root/out/x86/templates-mono
  cp -rvp bin/* /root/out/x86/templates-mono
  rm -rf bin
--- a/build-macosx/build.sh
+++ b/build-macosx/build.sh
@@ -5,11 +5,11 @@ set -e
 # Config

 export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS="osxcross_sdk=darwin24.2 production=yes"
+export OPTIONS="osxcross_sdk=darwin20.2 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-darwin24.2-strip -u -r"
+export STRIP="x86_64-apple-darwin20.2-strip -u -r"
 export TERM=xterm

 rm -rf godot
@@ -69,9 +69,10 @@ if [ "${MONO}" == "1" ]; then
  $STRIP bin/godot.osx.opt.tools.universal.mono

  # Make universal versions of the dylibs we use.
-  lipo -create tmp-lib/x86_64/libmono-native.dylib tmp-lib/arm64/libmono-native.dylib -output tmp-lib/libmono-native.dylib
+  lipo -create tmp-lib/x86_64/libmono-native-compat.dylib tmp-lib/arm64/libmono-native.dylib -output tmp-lib/libmono-native.dylib
  lipo -create tmp-lib/x86_64/libMonoPosixHelper.dylib tmp-lib/arm64/libMonoPosixHelper.dylib -output tmp-lib/libMonoPosixHelper.dylib
-  lipo -create tmp-lib/x86_64/libmono-btls-shared.dylib tmp-lib/arm64/libmono-btls-shared.dylib -output tmp-lib/libmono-btls-shared.dylib
+  # Somehow only included in x86_64 build.
+  cp tmp-lib/x86_64/libmono-btls-shared.dylib tmp-lib/

  cp -f tmp-lib/*.dylib bin/GodotSharp/Mono/lib/

--- a/build-mono-glue/build.sh
+++ b/build-mono-glue/build.sh
@@ -22,7 +22,7 @@ if [ "${MONO}" == "1" ]; then
  mono --version
  export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/pkgconfig/

-  ${SCONS} platform=x11 ${OPTIONS} target=release_debug tools=yes module_mono_enabled=yes mono_glue=no
+  ${SCONS} platform=x11 bits=64 ${OPTIONS} target=release_debug tools=yes module_mono_enabled=yes mono_glue=no

  rm -rf /root/mono-glue/*
  xvfb-run bin/godot.x11.opt.tools.64.mono --audio-driver Dummy --generate-mono-glue /root/mono-glue || /bin/true
--- a/build-release.sh
+++ b/build-release.sh
@@ -2,26 +2,23 @@

 set -e

-# Log output to a file automatically.
-exec > >(tee -a "out/logs/build-release") 2>&1
-
 # Config

 # For signing keystore and password.
 source ./config.sh

 can_sign_windows=0
-if [ ! -z "${WINDOWS_SIGN_NAME}" ] && [ ! -z "${WINDOWS_SIGN_URL}" ] && [[ $(type -P "osslsigncode") ]]; then
+if [ ! -z "${SIGN_KEYSTORE}" ] && [ ! -z "${SIGN_PASSWORD}" ] && [[ $(type -P "osslsigncode") ]]; then
  can_sign_windows=1
 else
-  echo "Disabling Windows binary signing as config.sh does not define the required data (WINDOWS_SIGN_NAME, WINDOWS_SIGN_URL), or osslsigncode can't be found in PATH."
+  echo "Disabling Windows binary signing as config.sh does not define the required data (SIGN_KEYSTORE, SIGN_PASSWORD), or osslsigncode can't be found in PATH."
 fi

 sign_windows() {
  if [ $can_sign_windows == 0 ]; then
    return
  fi
-  P11_KIT_SERVER_ADDRESS=unix:path=/run/p11-kit/p11kit.sock osslsigncode sign -pkcs11module /usr/lib64/pkcs11/p11-kit-client.so -pkcs11cert 'pkcs11:model=SimplySign%20C' -key 'pkcs11:model=SimplySign%20C' -t http://time.certum.pl/ -n "${WINDOWS_SIGN_NAME}" -i "${WINDOWS_SIGN_URL}" -in $1 -out $1-signed
+  osslsigncode sign -pkcs12 ${SIGN_KEYSTORE} -pass "${SIGN_PASSWORD}" -n "${SIGN_NAME}" -i "${SIGN_URL}" -t http://timestamp.comodoca.com -in $1 -out $1-signed
  mv $1-signed $1
 }

@@ -52,11 +49,12 @@ sign_macos() {
              -s ${OSX_KEY_ID} -v ${_extra_files} ${_appname} && \
            zip -r ${_binname}_signed.zip ${_appname}"

-  _request_uuid=$(ssh "${OSX_HOST}" "xcrun notarytool submit ${_osx_tmpdir}/${_binname}_signed.zip --team-id \"${APPLE_TEAM}\" --apple-id \"${APPLE_ID}\" --password \"${APPLE_ID_PASSWORD}\" --no-progress --output-format json")
-  _request_uuid=$(echo ${_request_uuid} | sed -e 's/.*"id":"\([^"]*\)".*/\1/')
-  if ! ssh "${OSX_HOST}" "xcrun notarytool wait ${_request_uuid} --team-id \"${APPLE_TEAM}\" --apple-id \"${APPLE_ID}\" --password \"${APPLE_ID_PASSWORD}\" | grep -q status:\ Accepted"; then
+  _request_uuid=$(ssh "${OSX_HOST}" "xcrun altool --notarize-app --primary-bundle-id \"${OSX_BUNDLE_ID}\" --username \"${APPLE_ID}\" --password \"${APPLE_ID_PASSWORD}\" --file ${_osx_tmpdir}/${_binname}_signed.zip")
+  _request_uuid=$(echo ${_request_uuid} | sed -e 's/.*RequestUUID = //')
+  ssh "${OSX_HOST}" "while xcrun altool --notarization-info ${_request_uuid} -u \"${APPLE_ID}\" -p \"${APPLE_ID_PASSWORD}\" | grep -q Status:\ in\ progress; do echo Waiting on Apple notarization...; sleep 30s; done"
+  if ! ssh "${OSX_HOST}" "xcrun altool --notarization-info ${_request_uuid} -u \"${APPLE_ID}\" -p \"${APPLE_ID_PASSWORD}\" | grep -q Status:\ success"; then
    echo "Notarization failed."
-    _notarization_log=$(ssh "${OSX_HOST}" "xcrun notarytool log ${_request_uuid} --team-id \"${APPLE_TEAM}\" --apple-id \"${APPLE_ID}\" --password \"${APPLE_ID_PASSWORD}\"")
+    _notarization_log=$(ssh "${OSX_HOST}" "xcrun altool --notarization-info ${_request_uuid} -u \"${APPLE_ID}\" -p \"${APPLE_ID_PASSWORD}\"")
    echo "${_notarization_log}"
    ssh "${OSX_HOST}" "rm -rf ${_osx_tmpdir}"
    exit 1
@@ -173,21 +171,13 @@ if [ "${build_classical}" == "1" ]; then
  # Editor
  binname="${godot_basename}_x11.64"
  cp out/linux/x64/tools/godot.x11.opt.tools.64 ${binname}
+  strip ${binname}
  zip -q -9 "${reldir}/${binname}.zip" ${binname}
  rm ${binname}

  binname="${godot_basename}_x11.32"
  cp out/linux/x86/tools/godot.x11.opt.tools.32 ${binname}
-  zip -q -9 "${reldir}/${binname}.zip" ${binname}
-  rm ${binname}
-
-  binname="${godot_basename}_linux.arm64"
-  cp out/linux/arm64/tools/godot.x11.opt.tools.arm64 ${binname}
-  zip -q -9 "${reldir}/${binname}.zip" ${binname}
-  rm ${binname}
-
-  binname="${godot_basename}_linux.arm32"
-  cp out/linux/arm/tools/godot.x11.opt.tools.arm ${binname}
+  strip ${binname}
  zip -q -9 "${reldir}/${binname}.zip" ${binname}
  rm ${binname}

@@ -196,35 +186,24 @@ if [ "${build_classical}" == "1" ]; then
  cp out/linux/x64/templates/godot.x11.opt.debug.64 ${templatesdir}/linux_x11_64_debug
  cp out/linux/x86/templates/godot.x11.opt.32 ${templatesdir}/linux_x11_32_release
  cp out/linux/x86/templates/godot.x11.opt.debug.32 ${templatesdir}/linux_x11_32_debug
-  cp out/linux/arm64/templates/godot.x11.opt.arm64 ${templatesdir}/linux_x11_arm64_release
-  cp out/linux/arm64/templates/godot.x11.opt.debug.arm64 ${templatesdir}/linux_x11_arm64_debug
-  cp out/linux/arm/templates/godot.x11.opt.arm ${templatesdir}/linux_x11_arm32_release
-  cp out/linux/arm/templates/godot.x11.opt.debug.arm ${templatesdir}/linux_x11_arm32_debug
+  strip ${templatesdir}/linux_x11_*

  ## Windows (Classical) ##

  # Editor
  binname="${godot_basename}_win64.exe"
-  batname="${godot_basename}_win64_console.cmd"
  cp out/windows/x64/tools/godot.windows.opt.tools.64.exe ${binname}
  strip ${binname}
  sign_windows ${binname}
-  echo "@echo off" > ${batname}
-  echo ${binname} >> ${batname}
-  echo "pause > nul" >> ${batname}
-  zip -q -9 "${reldir}/${binname}.zip" ${binname} ${batname}
-  rm ${binname} ${batname}
+  zip -q -9 "${reldir}/${binname}.zip" ${binname}
+  rm ${binname}

  binname="${godot_basename}_win32.exe"
-  batname="${godot_basename}_win32_console.cmd"
  cp out/windows/x86/tools/godot.windows.opt.tools.32.exe ${binname}
  strip ${binname}
  sign_windows ${binname}
-  echo "@echo off" > ${batname}
-  echo ${binname} >> ${batname}
-  echo "pause > nul" >> ${batname}
-  zip -q -9 "${reldir}/${binname}.zip" ${binname} ${batname}
-  rm ${binname} ${batname}
+  zip -q -9 "${reldir}/${binname}.zip" ${binname}
+  rm ${binname}

  # Templates
  cp out/windows/x64/templates/godot.windows.opt.64.exe ${templatesdir}/windows_64_release.exe
@@ -297,12 +276,6 @@ if [ "${build_classical}" == "1" ]; then
  # Lib for direct download
  cp out/android/templates/godot-lib.release.aar ${reldir}/godot-lib.${templates_version}.release.aar

-  # Editor
-  binname="${godot_basename}_android_editor.apk"
-  cp out/android/tools/android_editor.apk ${reldir}/${binname}
-  binname="${godot_basename}_android_editor.aab"
-  cp out/android/tools/android_editor.aab ${reldir}/${binname}
-
  # Templates
  cp out/android/templates/*.apk ${templatesdir}/
  cp out/android/templates/android_source.zip ${templatesdir}/
@@ -322,47 +295,41 @@ if [ "${build_classical}" == "1" ]; then

  ## UWP (Classical) ##

-  if [ -d "out/uwp" ]; then
-    # UWP is now optional as it's tricky to get a reproducible build container for it.
-
-    if [ ! -d "deps/angle-uwp" ]; then
-      echo "Downloading ANGLE binaries from https://github.com/godotengine/godot-build-scripts/releases/tag/_deps/"
-      mkdir -p deps && cd deps
-      curl -L -o angle-uwp.7z https://github.com/godotengine/godot-build-scripts/releases/download/_deps/angle-uwp-2.1.13.7z
-      7z x angle-uwp.7z && rm -f angle-uwp.7z
-      cd ..
-    fi
-
-    rm -rf uwp_template_*
-    for arch in ARM Win32 x64; do
-      cp -r git/misc/dist/uwp_template uwp_template_${arch}
-      cp deps/angle-uwp/${arch}/libEGL.dll \
-        deps/angle-uwp/${arch}/libGLESv2.dll \
-        uwp_template_${arch}/
-      cp -r uwp_template_${arch} uwp_template_${arch}_debug
-    done
-
-    cp out/uwp/arm/godot.uwp.opt.32.arm.exe uwp_template_ARM/godot.uwp.exe
-    cp out/uwp/arm/godot.uwp.opt.debug.32.arm.exe uwp_template_ARM_debug/godot.uwp.exe
-    cd uwp_template_ARM && zip -q -9 -r "${templatesdir}/uwp_arm_release.zip" * && cd ..
-    cd uwp_template_ARM_debug && zip -q -9 -r "${templatesdir}/uwp_arm_debug.zip" * && cd ..
-    rm -rf uwp_template_ARM*
-
-    cp out/uwp/x86/godot.uwp.opt.32.x86.exe uwp_template_Win32/godot.uwp.exe
-    cp out/uwp/x86/godot.uwp.opt.debug.32.x86.exe uwp_template_Win32_debug/godot.uwp.exe
-    cd uwp_template_Win32 && zip -q -9 -r "${templatesdir}/uwp_x86_release.zip" * && cd ..
-    cd uwp_template_Win32_debug && zip -q -9 -r "${templatesdir}/uwp_x86_debug.zip" * && cd ..
-    rm -rf uwp_template_Win32*
-
-    cp out/uwp/x64/godot.uwp.opt.64.x64.exe uwp_template_x64/godot.uwp.exe
-    cp out/uwp/x64/godot.uwp.opt.debug.64.x64.exe uwp_template_x64_debug/godot.uwp.exe
-    cd uwp_template_x64 && zip -q -9 -r "${templatesdir}/uwp_x64_release.zip" * && cd ..
-    cd uwp_template_x64_debug && zip -q -9 -r "${templatesdir}/uwp_x64_debug.zip" * && cd ..
-    rm -rf uwp_template_x64*
-  else
-    echo "Skipping UWP templates as no builds were found."
+  if [ ! -d "deps/angle" ]; then
+    echo "Downloading ANGLE binaries from https://github.com/GodotBuilder/godot-builds/releases/tag/_tools"
+    mkdir -p deps && cd deps
+    curl -LO https://github.com/GodotBuilder/godot-builds/releases/download/_tools/angle.7z
+    7z x angle.7z && rm -f angle.7z
+    cd ..
  fi

+  rm -rf uwp_template_*
+  for arch in ARM Win32 x64; do
+    cp -r git/misc/dist/uwp_template uwp_template_${arch}
+    cp deps/angle/winrt/10/src/Release_${arch}/libEGL.dll \
+      deps/angle/winrt/10/src/Release_${arch}/libGLESv2.dll \
+      uwp_template_${arch}/
+    cp -r uwp_template_${arch} uwp_template_${arch}_debug
+  done
+
+  cp out/uwp/arm/godot.uwp.opt.32.arm.exe uwp_template_ARM/godot.uwp.exe
+  cp out/uwp/arm/godot.uwp.opt.debug.32.arm.exe uwp_template_ARM_debug/godot.uwp.exe
+  cd uwp_template_ARM && zip -q -9 -r "${templatesdir}/uwp_arm_release.zip" * && cd ..
+  cd uwp_template_ARM_debug && zip -q -9 -r "${templatesdir}/uwp_arm_debug.zip" * && cd ..
+  rm -rf uwp_template_ARM*
+
+  cp out/uwp/x86/godot.uwp.opt.32.x86.exe uwp_template_Win32/godot.uwp.exe
+  cp out/uwp/x86/godot.uwp.opt.debug.32.x86.exe uwp_template_Win32_debug/godot.uwp.exe
+  cd uwp_template_Win32 && zip -q -9 -r "${templatesdir}/uwp_x86_release.zip" * && cd ..
+  cd uwp_template_Win32_debug && zip -q -9 -r "${templatesdir}/uwp_x86_debug.zip" * && cd ..
+  rm -rf uwp_template_Win32*
+
+  cp out/uwp/x64/godot.uwp.opt.64.x64.exe uwp_template_x64/godot.uwp.exe
+  cp out/uwp/x64/godot.uwp.opt.debug.64.x64.exe uwp_template_x64_debug/godot.uwp.exe
+  cd uwp_template_x64 && zip -q -9 -r "${templatesdir}/uwp_x64_release.zip" * && cd ..
+  cd uwp_template_x64_debug && zip -q -9 -r "${templatesdir}/uwp_x64_debug.zip" * && cd ..
+  rm -rf uwp_template_x64*
+
  ## Templates TPZ (Classical) ##

  echo "${templates_version}" > ${templatesdir}/version.txt
@@ -390,6 +357,7 @@ if [ "${build_mono}" == "1" ]; then
  binbasename="${godot_basename}_mono_x11"
  mkdir -p ${binbasename}_64
  cp out/linux/x64/tools-mono/godot.x11.opt.tools.64.mono ${binbasename}_64/${binbasename}.64
+  strip ${binbasename}_64/${binbasename}.64
  cp -rp out/linux/x64/tools-mono/GodotSharp ${binbasename}_64/
  cp -rp out/aot-compilers ${binbasename}_64/GodotSharp/Tools/
  zip -r -q -9 "${reldir_mono}/${binbasename}_64.zip" ${binbasename}_64
@@ -398,6 +366,7 @@ if [ "${build_mono}" == "1" ]; then
  binbasename="${godot_basename}_mono_x11"
  mkdir -p ${binbasename}_32
  cp out/linux/x86/tools-mono/godot.x11.opt.tools.32.mono ${binbasename}_32/${binbasename}.32
+  strip ${binbasename}_32/${binbasename}.32
  cp -rp out/linux/x86/tools-mono/GodotSharp/ ${binbasename}_32/
  cp -rp out/aot-compilers ${binbasename}_32/GodotSharp/Tools/
  zip -r -q -9 "${reldir_mono}/${binbasename}_32.zip" ${binbasename}_32
@@ -410,6 +379,7 @@ if [ "${build_mono}" == "1" ]; then
  cp -rp out/linux/x86/templates-mono/data.mono.x11.32.* ${templatesdir_mono}/
  cp out/linux/x86/templates-mono/godot.x11.opt.debug.32.mono ${templatesdir_mono}/linux_x11_32_debug
  cp out/linux/x86/templates-mono/godot.x11.opt.32.mono ${templatesdir_mono}/linux_x11_32_release
+  strip ${templatesdir_mono}/linux_x11*

  mkdir -p ${templatesdir_mono}/bcl
  cp -r out/linux/x64/tools-mono/GodotSharp/Mono/lib/mono/4.5/ ${templatesdir_mono}/bcl/net_4_x
@@ -418,32 +388,22 @@ if [ "${build_mono}" == "1" ]; then

  # Editor
  binname="${godot_basename}_mono_win64"
-  batname="${godot_basename}_mono_win64_console.cmd"
  mkdir -p ${binname}
  cp out/windows/x64/tools-mono/godot.windows.opt.tools.64.mono.exe ${binname}/${binname}.exe
  strip ${binname}/${binname}.exe
  sign_windows ${binname}/${binname}.exe
  cp -rp out/windows/x64/tools-mono/GodotSharp ${binname}/
  cp -rp out/aot-compilers ${binname}/GodotSharp/Tools/
-  echo "@echo off" > ${batname}
-  echo ${binname}.exe >> ${batname}
-  echo "pause > nul" >> ${batname}
-  mv ${batname} ${binname}/
  zip -r -q -9 "${reldir_mono}/${binname}.zip" ${binname}
  rm -rf ${binname}

  binname="${godot_basename}_mono_win32"
-  batname="${godot_basename}_mono_win32_console.cmd"
  mkdir -p ${binname}
  cp out/windows/x86/tools-mono/godot.windows.opt.tools.32.mono.exe ${binname}/${binname}.exe
  strip ${binname}/${binname}.exe
  sign_windows ${binname}/${binname}.exe
  cp -rp out/windows/x86/tools-mono/GodotSharp ${binname}/
  cp -rp out/aot-compilers ${binname}/GodotSharp/Tools/
-  echo "@echo off" > ${batname}
-  echo ${binname}.exe >> ${batname}
-  echo "pause > nul" >> ${batname}
-  mv ${batname} ${binname}/
  zip -r -q -9 "${reldir_mono}/${binname}.zip" ${binname}
  rm -rf ${binname}

@@ -521,10 +481,6 @@ if [ "${build_mono}" == "1" ]; then
  # Lib for direct download
  cp out/android/templates-mono/godot-lib.release.aar ${reldir_mono}/godot-lib.${templates_version}.mono.release.aar

-  # Editor
-  #binname="${godot_basename}_mono_android_editor.apk"
-  #cp out/android/tools-mono/android_editor.apk ${reldir_mono}/${binname}
-
  # Templates
  cp out/android/templates-mono/*.apk ${templatesdir_mono}/
  cp out/android/templates-mono/android_source.zip ${templatesdir_mono}/
--- a/build-uwp/build.sh
+++ b/build-uwp/build.sh
@@ -4,7 +4,7 @@ set -e

 # Config

-export SCONS="call scons -j8 verbose=yes warnings=no progress=no"
+export SCONS="call scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
 export OPTIONS="production=yes"
 export BUILD_ARCHES="x86 x64 arm"
 export ANGLE_SRC_PATH='c:\angle'
--- a/build.sh
+++ b/build.sh
@@ -4,13 +4,6 @@ set -e

 OPTIND=1

-export basedir="$(pwd)"
-mkdir -p ${basedir}/out
-mkdir -p ${basedir}/out/logs
-
-# Log output to a file automatically.
-exec > >(tee -a "out/logs/build") 2>&1
-
 # Config

 # For default registry and number of cores.
@@ -38,9 +31,8 @@ build_mono=1
 force_download=0
 skip_download=1
 skip_git_checkout=0
-build_uwp=0

-while getopts "h?r:u:p:v:g:b:fscw" opt; do
+while getopts "h?r:u:p:v:g:b:fsc" opt; do
  case "$opt" in
  h|\?)
    echo "Usage: $0 [OPTIONS...]"
@@ -54,7 +46,6 @@ while getopts "h?r:u:p:v:g:b:fscw" opt; do
    echo "  -f force redownload of all images"
    echo "  -s skip downloading"
    echo "  -c skip checkout"
-    echo "  -w build UWP templates"
    echo
    exit 1
    ;;
@@ -89,15 +80,22 @@ while getopts "h?r:u:p:v:g:b:fscw" opt; do
  c)
    skip_git_checkout=1
    ;;
-  w)
-    build_uwp=1
-    ;;
  esac
 done

-export podman=${PODMAN}
+export podman=none
+if which podman > /dev/null; then
+  export podman=podman
+elif which docker > /dev/null; then
+  export podman=docker
+fi

-if [ $UID != 0 ] && grep -qv sudo <<< "${podman}"; then
+if [ "${podman}" == "none" ]; then
+  echo "Either podman or docker needs to be installed"
+  exit 1
+fi
+
+if [ $UID != 0 ]; then
  echo "WARNING: Running as non-root may cause problems for the uwp build"
 fi

@@ -147,18 +145,6 @@ if [ $skip_download == 0 ]; then
  fi
 fi

-# Keystore for Android editor signing
-# Optional - the config.sh will be copied but if it's not filled in,
-# it will do an unsigned build.
-if [ ! -d "deps/keystore" ]; then
-  mkdir -p deps/keystore
-  cp config.sh deps/keystore/
-  if [ ! -z "$GODOT_ANDROID_SIGN_KEYSTORE" ]; then
-    cp "$GODOT_ANDROID_SIGN_KEYSTORE" deps/keystore/
-    sed -i deps/keystore/config.sh -e "s@$GODOT_ANDROID_SIGN_KEYSTORE@/root/keystore/$GODOT_ANDROID_SIGN_KEYSTORE@"
-  fi
-fi
-
 if [ "${skip_git_checkout}" == 0 ]; then
  git clone https://github.com/godotengine/godot git || /bin/true
  pushd git
@@ -186,12 +172,17 @@ EOF
  popd
 fi

-export podman_run="${podman} run -it --rm --env BUILD_NAME=${BUILD_NAME} --env GODOT_VERSION_STATUS=${GODOT_VERSION_STATUS} --env NUM_CORES=${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=$IMAGE_VERSION
+export basedir="$(pwd)"
+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

 # Get AOT compilers from their containers.
 mkdir -p ${basedir}/out/aot-compilers
-${podman} run -it --rm -w /root -v ${basedir}/out/aot-compilers:/root/out localhost/godot-ios:${img_version} bash -c "cp -r /root/aot-compilers/* /root/out && chmod +x /root/out/*/*"
+${podman} run -it --rm -w /root -v ${basedir}/out/aot-compilers:/root/out localhost/godot-ios:${img_version} bash -c "cp -r /root/aot-compilers/* /root/out"
+chmod +x ${basedir}/out/aot-compilers/*/*

 mkdir -p ${basedir}/mono-glue
 ${podman_run} -v ${basedir}/build-mono-glue:/root/build localhost/godot-mono-glue:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/mono-glue
@@ -209,7 +200,7 @@ mkdir -p ${basedir}/out/macosx
 ${podman_run} -v ${basedir}/build-macosx:/root/build -v ${basedir}/out/macosx:/root/out localhost/godot-osx:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/macosx

 mkdir -p ${basedir}/out/android
-${podman_run} -v ${basedir}/build-android:/root/build -v ${basedir}/out/android:/root/out -v ${basedir}/deps/keystore:/root/keystore localhost/godot-android:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/android
+${podman_run} -v ${basedir}/build-android:/root/build -v ${basedir}/out/android:/root/out localhost/godot-android:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/android

 mkdir -p ${basedir}/out/ios
 ${podman_run} -v ${basedir}/build-ios:/root/build -v ${basedir}/out/ios:/root/out localhost/godot-ios:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/ios
@@ -217,15 +208,9 @@ ${podman_run} -v ${basedir}/build-ios:/root/build -v ${basedir}/out/ios:/root/ou
 mkdir -p ${basedir}/out/server
 ${podman_run} -v ${basedir}/build-server:/root/build -v ${basedir}/out/server:/root/out localhost/godot-linux:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/server

-if [ "${build_uwp}" == "1" ]; then
-  mkdir -p ${basedir}/out/uwp
-  ${podman_run} --ulimit nofile=32768:32768 -v ${basedir}/build-uwp:/root/build -v ${basedir}/out/uwp:/root/out ${registry}/godot-private/uwp:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/uwp
-fi
+mkdir -p ${basedir}/out/uwp
+${podman_run} --ulimit nofile=32768:32768 -v ${basedir}/build-uwp:/root/build -v ${basedir}/out/uwp:/root/out ${registry}/godot-private/uwp:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/uwp

-uid=$(id -un)
-gid=$(id -gn)
 if [ ! -z "$SUDO_UID" ]; then
-  uid="${SUDO_UID}"
-  gid="${SUDO_GID}"
+  chown -R "${SUDO_UID}":"${SUDO_GID}" ${basedir}/git ${basedir}/out ${basedir}/mono-glue ${basedir}/godot*.tar.gz
 fi
-chown -R -f $uid:$gid ${basedir}/git ${basedir}/out ${basedir}/mono-glue ${basedir}/godot*.tar.gz
--- a/clean-release.sh
+++ b/clean-release.sh
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-rm -rf releases tmp web
--- a/clean.sh
+++ b/clean.sh
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-rm -rf godot*.tar.gz mono-glue out releases tmp web
-git status
--- a/config.sh.in
+++ b/config.sh.in
@@ -3,87 +3,42 @@
 # Configuration file for user-specific details.
 # This file is gitignore'd and will be sourced by build scripts.

-# Note: For passwords or GPG keys, make sure that special characters such
-# as $ won't be expanded, by using single quotes to enclose the string,
-# or escaping with \$.
-
-# These scripts are designed and tested against podman. They may also work
-# with docker, but it's not guaranteed. You can set this variable to the
-# relevant tool in your PATH or an absolute path to run it from.
-export PODMAN='sudo podman'
-
-# GitHub token for @GodotBuilder for releases on godotengine/godot-builds,
-# can use a long expiry date.
-# For stable releases to godotengine/godot, generate a personal token with
-# write access to godotengine/godot for use in publish-release.sh.
-export GH_TOKEN=''
-
-# Path to a Git clone of https://github.com/godotengine/godot-builds.
-# Only used for uploading official releases.
-export GODOT_BUILDS_PATH=''
-
-# Path to the directory with the Steam upload setup.
-export UPLOAD_STEAM_PATH=''
-
-# SSH hostname to upload Web editor builds to.
-# Only used for uploading official releases.
-export WEB_EDITOR_HOSTNAME=''
-
 # Registry for build containers.
 # The default registry is the one used for official Godot builds.
 # Note that some of its images are private and only accessible to selected
 # contributors.
 # You can build your own registry with scripts at
 # https://github.com/godotengine/build-containers
-export REGISTRY='registry.prehensile-tales.com'
-
-# Version string of the images to use in build.sh.
-export IMAGE_VERSION='3.7-f42-mono-6.12.0.206'
+export REGISTRY="registry.prehensile-tales.com"

 # Default build name used to distinguish between official and custom builds.
-export BUILD_NAME='custom_build'
+export BUILD_NAME="custom_build"

 # Default number of parallel cores for each build.
 export NUM_CORES=16

-# Set up your own Windows signing details below.
-# If you do not fill all WINDOWS_SIGN_* fields, signing will be skipped.
+# Set up your own signing keystore and relevant details below.
+# If you do not fill all SIGN_* fields, signing will be skipped.
+
+# Path to pkcs12 archive.
+export SIGN_KEYSTORE=""
+
+# Password for the private key.
+export SIGN_PASSWORD=""

 # Name and URL of the signed application.
 # Use your own when making a thirdparty build.
-export WINDOWS_SIGN_NAME=''
-export WINDOWS_SIGN_URL=''
+export SIGN_NAME=""
+export SIGN_URL=""

 # Hostname or IP address of an OSX host (Needed for signing)
-# eg 'user@10.1.0.10'
-export OSX_HOST=''
+# eg "user@10.1.0.10"
+export OSX_HOST=""
 # ID of the Apple certificate used to sign
-export OSX_KEY_ID=''
+export OSX_KEY_ID=""
 # Bundle id for the signed app
-export OSX_BUNDLE_ID=''
-# Username/password for Apple's signing APIs (used for notarytool)
-export APPLE_TEAM=''
-export APPLE_ID=''
-export APPLE_ID_PASSWORD=''
+export OSX_BUNDLE_ID=""
+# Username/password for Apple's signing APIs (used for atltool)
+export APPLE_ID=""
+export APPLE_ID_PASSWORD=""

-# MavenCentral (sonatype) credentials
-export OSSRH_GROUP_ID=''
-export OSSRH_USERNAME=''
-export OSSRH_PASSWORD=''
-# Sonatype assigned ID used to upload the generated artifacts
-export SONATYPE_STAGING_PROFILE_ID=''
-# Used to sign the artifacts after they're built
-# ID of the GPG key pair, the last eight characters of its fingerprint
-export SIGNING_KEY_ID=''
-# Passphrase of the key pair
-export SIGNING_PASSWORD=''
-# Base64 encoded private GPG key
-export SIGNING_KEY=''
-
-# Android signing configs
-# Path to the Android keystore file used to sign the release build
-export GODOT_ANDROID_SIGN_KEYSTORE=''
-# Key alias used for signing the release build
-export GODOT_ANDROID_KEYSTORE_ALIAS=''
-# Password for the key used for signing the release build
-export GODOT_ANDROID_SIGN_PASSWORD=''
--- a/publish-release.sh
+++ b/publish-release.sh
@@ -1,174 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Log output to a file automatically.
-exec > >(tee -a "out/logs/publish-release") 2>&1
-
-# Config
-
-# For upload tools and signing/release keys.
-source ./config.sh
-
-godot_version=""
-skip_stable=0
-draft_arg=""
-
-while getopts "h?v:sd" opt; do
-  case "$opt" in
-  h|\?)
-    echo "Usage: $0 [OPTIONS...]"
-    echo
-    echo "  -v godot version (e.g: 3.2-stable) [mandatory]"
-    echo "  -s don't run stable specific steps"
-    echo "  -d publish as draft release on GitHub"
-    echo
-    exit 1
-    ;;
-  v)
-    godot_version=$OPTARG
-    ;;
-  s)
-    skip_stable=1
-    ;;
-  d)
-    draft_arg="-d"
-    ;;
-  esac
-done
-
-if [ -z "${godot_version}" ]; then
-  echo "Mandatory argument -v missing."
-  exit 1
-fi
-
-basedir=$(pwd)
-reldir=${basedir}/releases/${godot_version}
-
-# Confirm
-
-IFS=- read version status <<< "${godot_version}"
-echo "Publishing Godot ${version} ${status}."
-read -p "Is this correct (y/n)? " choice
-case "$choice" in
-  y|Y ) echo "yes";;
-  n|N ) echo "No, aborting."; exit 0;;
-  * ) echo "Invalid choice, aborting."; exit 1;;
-esac
-template_version=${version}.${status}
-
-# Config checks for stable releases.
-
-if [ "${status}" == "stable" -a "${skip_stable}" == "0" ]; then
-  echo "Publishing a stable release. Checking that configuration is valid to perform stable release specific steps."
-
-  read -p "Enter personal access token (GH_TOKEN) for godotengine/godot: " personal_gh_token
-  if [[ "${personal_gh_token}" != "github_pat_"* ]]; then
-    echo "Provided personal access token should start with 'github_pat', aborting."
-    exit 1
-  fi
-
-  if ! gh api repos/godotengine/godot/git/refs/tags | grep -q ${godot_version}; then
-    echo "The tag '${godot_version}' does not exist in godotengine/godot, aborting."
-    echo "Push commits and create it manually before running this script."
-    exit 1
-  fi
-
-  if [ ! -d "${UPLOAD_STEAM_PATH}" ]; then
-    echo "Invalid config.sh: UPLOAD_STEAM_PATH is not a directory, aborting."
-    exit 1
-  fi
-fi
-
-# Upload to GitHub godot-builds
-
-echo "Uploading release to to godotengine/godot-builds repository."
-
-if [ -z "${GODOT_BUILDS_PATH}" ]; then
-  echo "Missing path to godotengine/godot-builds clone in config.sh, necessary to upload releases. Aborting."
-  exit 1
-fi
-
-${GODOT_BUILDS_PATH}/tools/upload-github.sh -v ${version} -f ${status} ${draft_arg}
-
-# Stable release only
-
-if [ "${status}" == "stable" -a "${skip_stable}" == "0" ]; then
-  namever=Godot_v${godot_version}
-
-  echo "Uploading stable release to main GitHub repository."
-
-  export GH_TOKEN=${personal_gh_token}
-  pushd git
-  # Get release details from existing godot-builds release.
-  release_info=$(gh release view ${godot_version} --repo godotengine/godot-builds --json name,body)
-  release_title=$(echo "$release_info" | jq -r '.name')
-  release_desc=$(echo "$release_info" | jq -r '.body')
-
-  gh release create ${godot_version} --repo godotengine/godot --title "$release_title" --notes "$release_desc" ${draft_arg}
-  gh release upload ${godot_version} ${reldir}/[Gg]* ${reldir}/mono/[Gg]*
-  # Concatenate SHA sums.
-  cp ${reldir}/SHA512-SUMS.txt .
-  cat ${reldir}/mono/SHA512-SUMS.txt >> SHA512-SUMS.txt
-  gh release upload ${godot_version} SHA512-SUMS.txt
-  rm SHA512-SUMS.txt
-  popd
-
-  echo "Uploading stable release to Steam."
-
-  pushd ${UPLOAD_STEAM_PATH}
-  rm -rf content/bin/[Gg]*
-  rm -rf content/editor_data/templates/*
-  cp -f ${basedir}/git/*.{md,txt,png,svg} content/
-  pushd content/bin/
-  unzip ${reldir}/${namever}_x11.64.zip
-  unzip ${reldir}/${namever}_x11.32.zip
-  unzip ${reldir}/${namever}_win64.exe.zip
-  unzip ${reldir}/${namever}_win32.exe.zip
-  unzip ${reldir}/${namever}_osx.universal.zip
-  mv ${namever}_x11.64 godot.x11.opt.tools.64
-  mv ${namever}_x11.32 godot.x11.opt.tools.32
-  mv ${namever}_win64.exe godot.windows.opt.tools.64.exe
-  mv ${namever}_win32.exe godot.windows.opt.tools.32.exe
-  popd
-  unzip ${reldir}/${namever}_export_templates.tpz -d content/editor_data/templates/
-  mv content/editor_data/templates/{templates,${template_version}}
-  steam_build/build.sh
-  popd
-
-  echo "All stable release upload steps done."
-fi
-
-# Web editor
-
-echo "Uploading web editor... (with retry logic as it can be flaky)"
-
-MAX_RETRIES=5
-delay=5
-
-retry_command() {
-    local attempt=1
-    local cmd=$1
-    while [ ${attempt} -le ${MAX_RETRIES} ]; do
-        echo "Attempt ${attempt}: Running command..."
-        eval "${cmd}" && return 0  # Success
-
-        echo "Command failed. Retrying in ${delay} seconds..."
-        sleep ${delay}
-        ((attempt++))
-        delay=$((delay * 2))  # Exponential backoff
-    done
-
-    echo "❌ Command failed after ${MAX_RETRIES} attempts."
-    return 1
-}
-
-command="sudo mv /home/akien/web_editor/${template_version} /var/www/editor.godotengine.org/public/releases/"
-command="${command}; cd /var/www/editor.godotengine.org; sudo chown -R www-data:www-data public/releases/${template_version}"
-command="${command}; sudo ./create-symlinks.sh -v ${template_version}"
-
-retry_command "scp -P 22 -r web/${template_version} ${WEB_EDITOR_HOSTNAME}:/home/akien/web_editor/"
-sleep 2
-retry_command "ssh -p 22 ${WEB_EDITOR_HOSTNAME} '${command}'"
-
-echo "All publishing steps done. Check out/logs/publish-release to double check that all steps succeeded."