Relintai/godot-mono-builds
1
0
Fork 0
mirror of https://github.com/Relintai/godot-mono-builds.git synced 2025-02-04 16:16:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15 from akien-mga/ci-mono-6.12-emsdk-1.39.7

Browse Source 
CI: Build with Mono 6.12.0.111 and Emscripten 1.39.7
This commit is contained in:
Rémi Verschelde 2020-11-16 20:21:28 +01:00 committed by GitHub
commit 42b90fe9a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.github/workflows/build.yml vendored
View File

@ -27,9 +27,9 @@ on:
env: env:
# Use SHA instead of the branch for caching purposes # Use SHA instead of the branch for caching purposes
MONO_TAG: mono-6.8.0.123 MONO_TAG: mono-6.12.0.111
PYTHON_VERSION: 3.8 PYTHON_VERSION: 3.8
EMSDK_VERSION: 1.38.47-upstream EMSDK_VERSION: 1.39.9
ANDROID_PLATFORM: android-29 ANDROID_PLATFORM: android-29
ANDROID_CMAKE_VERSION: 3.6.4111459 ANDROID_CMAKE_VERSION: 3.6.4111459
ANDROID_API: 21 ANDROID_API: 21
@ -45,7 +45,7 @@ jobs:
steps: steps:
- name: Set Environment Variables - name: Set Environment Variables
run: | run: |
echo "::set-env name=MONO_SOURCE_ROOT::$GITHUB_WORKSPACE/mono_sources" echo "MONO_SOURCE_ROOT=$GITHUB_WORKSPACE/mono_sources" >> $GITHUB_ENV
- name: Install Dependencies (x86) - name: Install Dependencies (x86)
if: matrix.target == 'x86' if: matrix.target == 'x86'
run: | run: |
@ -118,7 +118,7 @@ jobs:
steps: steps:
- name: Set Environment Variables - name: Set Environment Variables
run: | run: |
echo "::set-env name=MONO_SOURCE_ROOT::$GITHUB_WORKSPACE/mono_sources" echo "MONO_SOURCE_ROOT=$GITHUB_WORKSPACE/mono_sources" >> $GITHUB_ENV
- name: Install Dependencies (x86) - name: Install Dependencies (x86)
if: matrix.target == 'x86' if: matrix.target == 'x86'
run: | run: |
@ -192,7 +192,7 @@ jobs:
steps: steps:
- name: Set Environment Variables - name: Set Environment Variables
run: | run: |
echo "::set-env name=MONO_SOURCE_ROOT::$GITHUB_WORKSPACE/mono_sources" echo "MONO_SOURCE_ROOT=$GITHUB_WORKSPACE/mono_sources" >> $GITHUB_ENV
- name: Install Dependencies - name: Install Dependencies
run: | run: |
brew install autoconf automake libtool pkg-config cmake python3 brew install autoconf automake libtool pkg-config cmake python3
@ -256,7 +256,7 @@ jobs:
steps: steps:
- name: Set Environment Variables - name: Set Environment Variables
run: | run: |
echo "::set-env name=MONO_SOURCE_ROOT::$GITHUB_WORKSPACE/mono_sources" echo "MONO_SOURCE_ROOT=$GITHUB_WORKSPACE/mono_sources" >> $GITHUB_ENV
- name: Install Dependencies - name: Install Dependencies
run: | run: |
brew install autoconf automake libtool pkg-config cmake python3 brew install autoconf automake libtool pkg-config cmake python3
@ -326,7 +326,7 @@ jobs:
steps: steps:
- name: Set Environment Variables - name: Set Environment Variables
run: | run: |
echo "::set-env name=MONO_SOURCE_ROOT::$GITHUB_WORKSPACE/mono_sources" echo "MONO_SOURCE_ROOT=$GITHUB_WORKSPACE/mono_sources" >> $GITHUB_ENV
- name: Install Dependencies - name: Install Dependencies
run: | run: |
brew install autoconf automake libtool pkg-config cmake python3 brew install autoconf automake libtool pkg-config cmake python3
@ -414,7 +414,7 @@ jobs:
steps: steps:
- name: Set Environment Variables - name: Set Environment Variables
run: | run: |
echo "::set-env name=MONO_SOURCE_ROOT::$GITHUB_WORKSPACE/mono_sources" echo "MONO_SOURCE_ROOT=$GITHUB_WORKSPACE/mono_sources" >> $GITHUB_ENV
- name: Install Dependencies - name: Install Dependencies
run: | run: |
sudo apt-get -y update sudo apt-get -y update
@ -426,8 +426,8 @@ jobs:
androidsdk "platforms;${ANDROID_PLATFORM}" androidsdk "platforms;${ANDROID_PLATFORM}"
androidsdk "ndk-bundle" androidsdk "ndk-bundle"
androidsdk "cmake;${ANDROID_CMAKE_VERSION}" androidsdk "cmake;${ANDROID_CMAKE_VERSION}"
echo "::set-env name=ANDROID_SDK_ROOT::$HOME/snap/androidsdk/current/" echo "ANDROID_SDK_ROOT=$HOME/snap/androidsdk/current/" >> $GITHUB_ENV
echo "::set-env name=ANDROID_NDK_ROOT::$ANDROID_SDK_ROOT/ndk-bundle" echo "ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk-bundle" >> $GITHUB_ENV
- name: Cache Mono Sources - name: Cache Mono Sources
id: cache_mono_sources id: cache_mono_sources
uses: actions/cache@v1.2.0 uses: actions/cache@v1.2.0
@ -540,7 +540,7 @@ jobs:
steps: steps:
- name: Set Environment Variables - name: Set Environment Variables
run: | run: |
echo "::set-env name=MONO_SOURCE_ROOT::$GITHUB_WORKSPACE/mono_sources" echo "MONO_SOURCE_ROOT=$GITHUB_WORKSPACE/mono_sources" >> $GITHUB_ENV
- name: Install Dependencies - name: Install Dependencies
run: | run: |
sudo apt-get -y update sudo apt-get -y update
@ -556,8 +556,8 @@ jobs:
androidsdk "platforms;${ANDROID_PLATFORM}" androidsdk "platforms;${ANDROID_PLATFORM}"
androidsdk "ndk-bundle" androidsdk "ndk-bundle"
androidsdk "cmake;${ANDROID_CMAKE_VERSION}" androidsdk "cmake;${ANDROID_CMAKE_VERSION}"
echo "::set-env name=ANDROID_SDK_ROOT::$HOME/snap/androidsdk/current/" echo "ANDROID_SDK_ROOT=$HOME/snap/androidsdk/current/" >> $GITHUB_ENV
echo "::set-env name=ANDROID_NDK_ROOT::$ANDROID_SDK_ROOT/ndk-bundle" echo "ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk-bundle" >> $GITHUB_ENV
- name: Cache Mono Sources - name: Cache Mono Sources
id: cache_mono_sources id: cache_mono_sources
uses: actions/cache@v1.2.0 uses: actions/cache@v1.2.0
@ -640,7 +640,7 @@ jobs:
steps: steps:
- name: Set Environment Variables - name: Set Environment Variables
run: | run: |
echo "::set-env name=MONO_SOURCE_ROOT::$GITHUB_WORKSPACE/mono_sources" echo "MONO_SOURCE_ROOT=$GITHUB_WORKSPACE/mono_sources" >> $GITHUB_ENV
- name: Install Dependencies - name: Install Dependencies
run: | run: |
sudo apt-get -y update sudo apt-get -y update
@ -726,7 +726,7 @@ jobs:
key: ${{ runner.os }}-${{ env.MONO_TAG }}-llvm-${{ matrix.target }} key: ${{ runner.os }}-${{ env.MONO_TAG }}-llvm-${{ matrix.target }}
- name: Set Environment Variables - name: Set Environment Variables
run: | run: |
echo "::set-env name=MONO_SOURCE_ROOT::$GITHUB_WORKSPACE/mono_sources" echo "MONO_SOURCE_ROOT=$GITHUB_WORKSPACE/mono_sources" >> $GITHUB_ENV
- name: Install Dependencies (Linux) - name: Install Dependencies (Linux)
if: steps.cache_llvm.outputs.cache-hit != 'true' && runner.os == 'Linux' if: steps.cache_llvm.outputs.cache-hit != 'true' && runner.os == 'Linux'
run: | run: |
@ -800,7 +800,7 @@ jobs:
steps: steps:
- name: Set Environment Variables - name: Set Environment Variables
run: | run: |
echo "::set-env name=MONO_SOURCE_ROOT::$GITHUB_WORKSPACE/mono_sources" echo "MONO_SOURCE_ROOT=$GITHUB_WORKSPACE/mono_sources" >> $GITHUB_ENV
- name: Install Dependencies - name: Install Dependencies
run: | run: |
sudo apt-get -y update sudo apt-get -y update

4
files/patches/mono_ios_asl_log_deprecated.diff
View File

@ -6,8 +6,8 @@ index 3cb127bad59..30ff5edc307 100644
*/ */
#include <config.h> #include <config.h>
-#if defined(HOST_WATCHOS) && (__WATCH_OS_VERSION_MIN_REQUIRED >= __WATCHOS_3_0) -#if (defined(HOST_WATCHOS) && (__WATCH_OS_VERSION_MIN_REQUIRED >= __WATCHOS_3_0)) || defined(HOST_MACCAT)
+#if (defined(HOST_WATCHOS) && (__WATCH_OS_VERSION_MIN_REQUIRED >= __WATCHOS_3_0)) \ +#if (defined(HOST_WATCHOS) && (__WATCH_OS_VERSION_MIN_REQUIRED >= __WATCHOS_3_0)) || defined(HOST_MACCAT) \
+ || (defined(HOST_IOS) && (__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 100000)) + || (defined(HOST_IOS) && (__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 100000))
/* emitted by clang: /* emitted by clang:
* > /Users/lewurm/work/mono-watch4/mono/utils/mono-log-darwin.c:35:2: error: 'asl_log' is \ * > /Users/lewurm/work/mono-watch4/mono/utils/mono-log-darwin.c:35:2: error: 'asl_log' is \

4
format.sh
View File

@ -6,13 +6,15 @@ IFS=$'\n\t'
# Loops through all text files tracked by Git. # Loops through all text files tracked by Git.
git grep -zIl '' | git grep -zIl '' |
while IFS= read -rd '' f; do while IFS= read -rd '' f; do
# Exclude csproj and hdr files. # Exclude csproj and hdr files, and patches.
if [[ "$f" == *"csproj" ]]; then if [[ "$f" == *"csproj" ]]; then
continue continue
elif [[ "$f" == *"hdr" ]]; then elif [[ "$f" == *"hdr" ]]; then
continue continue
elif [[ "$f" == *"diff" ]]; then elif [[ "$f" == *"diff" ]]; then
continue continue
elif [[ "$f" == *"patch" ]]; then
continue
fi fi
# Ensures that files are UTF-8 formatted. # Ensures that files are UTF-8 formatted.
recode UTF-8 "$f" 2> /dev/null recode UTF-8 "$f" 2> /dev/null

14
ios.py
View File

@ -96,6 +96,9 @@ def setup_ios_device_template(env: dict, opts: iOSOpts, target: str):
'ac_cv_func_futimens=no', 'ac_cv_func_futimens=no',
'ac_cv_func_utimensat=no', 'ac_cv_func_utimensat=no',
'ac_cv_func_shm_open_working_with_mmap=no', 'ac_cv_func_shm_open_working_with_mmap=no',
'ac_cv_func_pthread_jit_write_protect_np=no',
'ac_cv_func_preadv=no',
'ac_cv_func_pwritev=no',
'mono_cv_sizeof_sunpath=104', 'mono_cv_sizeof_sunpath=104',
'mono_cv_uscore=yes' 'mono_cv_uscore=yes'
] ]
@ -121,13 +124,7 @@ def setup_ios_device_template(env: dict, opts: iOSOpts, target: str):
'-DSMALL_CONFIG', '-D_XOPEN_SOURCE', '-DHOST_IOS', '-DHAVE_LARGE_FILE_SUPPORT=1' '-DSMALL_CONFIG', '-D_XOPEN_SOURCE', '-DHOST_IOS', '-DHAVE_LARGE_FILE_SUPPORT=1'
] ]
LDFLAGS = [] LDFLAGS = [
# https://github.com/mono/mono/issues/19393
if os.environ.get('DISABLE_NO_WEAK_IMPORTS', '0') != '1':
LDFLAGS += ['-Wl,-no_weak_imports']
LDFLAGS += [
'-arch %s' % arch, '-arch %s' % arch,
'-framework', 'CoreFoundation', '-framework', 'CoreFoundation',
'-lobjc', '-lc++' '-lobjc', '-lc++'
@ -225,6 +222,9 @@ def setup_ios_simulator_template(env: dict, opts: iOSOpts, target: str):
'ac_cv_func_futimens=no', 'ac_cv_func_futimens=no',
'ac_cv_func_utimensat=no', 'ac_cv_func_utimensat=no',
'ac_cv_func_shm_open_working_with_mmap=no', 'ac_cv_func_shm_open_working_with_mmap=no',
'ac_cv_func_pthread_jit_write_protect_np=no',
'ac_cv_func_preadv=no',
'ac_cv_func_pwritev=no',
'mono_cv_uscore=yes' 'mono_cv_uscore=yes'
] ]

6
llvm.py
View File

@ -38,8 +38,8 @@ def make(opts: BaseOpts, target: str):
CMAKE_ARGS += [ CMAKE_ARGS += [
'-DCMAKE_EXE_LINKER_FLAGS="-static"', '-DCMAKE_EXE_LINKER_FLAGS="-static"',
'-DCROSS_TOOLCHAIN_FLAGS_NATIVE=-DCMAKE_TOOLCHAIN_FILE=%s/external/llvm/cmake/modules/NATIVE.cmake' % opts.mono_source_root, '-DCROSS_TOOLCHAIN_FLAGS_NATIVE=-DCMAKE_TOOLCHAIN_FILE=%s/external/llvm-project/llvm/cmake/modules/NATIVE.cmake' % opts.mono_source_root,
'-DCMAKE_TOOLCHAIN_FILE=%s/external/llvm/cmake/modules/%s.cmake' % (opts.mono_source_root, mxe), '-DCMAKE_TOOLCHAIN_FILE=%s/external/llvm-project/llvm/cmake/modules/%s.cmake' % (opts.mono_source_root, mxe),
'-DLLVM_ENABLE_THREADS=Off', '-DLLVM_ENABLE_THREADS=Off',
'-DLLVM_BUILD_EXECUTION_ENGINE=Off' '-DLLVM_BUILD_EXECUTION_ENGINE=Off'
] ]
@ -58,7 +58,7 @@ def make(opts: BaseOpts, target: str):
replace_in_new_file( replace_in_new_file(
src_file='%s/sdks/builds/%s.cmake.in' % (opts.mono_source_root, mxe), src_file='%s/sdks/builds/%s.cmake.in' % (opts.mono_source_root, mxe),
search='@MXE_PATH@', replace=opts.mxe_prefix, search='@MXE_PATH@', replace=opts.mxe_prefix,
dst_file='%s/external/llvm/cmake/modules/%s.cmake' % (opts.mono_source_root, mxe) dst_file='%s/external/llvm-project/llvm/cmake/modules/%s.cmake' % (opts.mono_source_root, mxe)
) )
if target in ['llvm32', 'llvmwin32']: if target in ['llvm32', 'llvmwin32']:

1
patch_emscripten.py
View File

@ -23,7 +23,6 @@ def main(raw_args):
patches = [ patches = [
'%s/sdks/builds/fix-emscripten-8511.diff' % mono_source_root, '%s/sdks/builds/fix-emscripten-8511.diff' % mono_source_root,
'%s/sdks/builds/emscripten-pr-8457.diff' % mono_source_root
] ]
from subprocess import Popen from subprocess import Popen