UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.1' into 4.2-beta

Browse Source
This commit is contained in:
Nathan Sweet 2023-07-28 13:58:35 -04:00
commit 4658ba2189
3 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/actions/setup-godot-deps/action.yml vendored
View File

@ -24,4 +24,9 @@ runs:
run: | run: |
python -c "import sys; print(sys.version)" python -c "import sys; print(sys.version)"
python -m pip install scons==4.4.0 python -m pip install scons==4.4.0
scons --version scons --version
- name: Setup dotnet 6
uses: actions/setup-dotnet@v3
with:
dotnet-version: '6.0.x'

72
.github/workflows/spine-godot-v4.yml vendored
View File

@ -61,7 +61,7 @@ jobs:
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: ${{ format('{0}{1}.zip', 'godot-editor-windows', env.GODOT_MONO_UPLOAD_SUFFIX) }} name: ${{ format('{0}-{1}{2}.zip', 'godot-editor-windows', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
path: spine-godot/godot/bin/**/* path: spine-godot/godot/bin/**/*
godot-editor-linux: godot-editor-linux:
@ -85,7 +85,7 @@ jobs:
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: ${{ format('{0}{1}.zip', 'godot-editor-linux', env.GODOT_MONO_UPLOAD_SUFFIX) }} name: ${{ format('{0}-{1}{2}.zip', 'godot-editor-linux', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
path: spine-godot/godot/bin/**/* path: spine-godot/godot/bin/**/*
godot-editor-macos: godot-editor-macos:
@ -111,7 +111,7 @@ jobs:
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: ${{ format('{0}{1}.zip', 'godot-editor-macos', env.GODOT_MONO_UPLOAD_SUFFIX) }} name: ${{ format('{0}-{1}{2}.zip', 'godot-editor-macos', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
path: spine-godot/godot/bin/godot-editor-macos.zip path: spine-godot/godot/bin/godot-editor-macos.zip
godot-template-ios: godot-template-ios:
@ -135,7 +135,7 @@ jobs:
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: ${{ format('{0}{1}.zip', 'godot-template-ios', env.GODOT_MONO_UPLOAD_SUFFIX) }} name: ${{ format('{0}-{1}{2}.zip', 'godot-template-ios', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
path: spine-godot/godot/bin/ios.zip path: spine-godot/godot/bin/ios.zip
godot-template-macos: godot-template-macos:
@ -157,7 +157,7 @@ jobs:
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: ${{ format('{0}{1}.zip', 'godot-template-macos', env.GODOT_MONO_UPLOAD_SUFFIX) }} name: ${{ format('{0}-{1}{2}.zip', 'godot-template-macos', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
path: spine-godot/godot/bin/macos.zip path: spine-godot/godot/bin/macos.zip
godot-template-linux: godot-template-linux:
@ -180,13 +180,13 @@ jobs:
- name: Upload artifacts debug - name: Upload artifacts debug
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: ${{ format('{0}{1}.zip', 'godot-template-linux-debug', env.GODOT_MONO_UPLOAD_SUFFIX) }} name: ${{ format('{0}-{1}{2}.zip', 'godot-template-linux-debug', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
path: spine-godot/godot/bin/linux_debug.x86_64 path: spine-godot/godot/bin/linux_debug.x86_64
- name: Upload artifacts release - name: Upload artifacts release
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: ${{ format('{0}{1}.zip', 'godot-template-linux-release', env.GODOT_MONO_UPLOAD_SUFFIX) }} name: ${{ format('{0}-{1}{2}.zip', 'godot-template-linux-release', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
path: spine-godot/godot/bin/linux_release.x86_64 path: spine-godot/godot/bin/linux_release.x86_64
godot-template-windows: godot-template-windows:
@ -208,13 +208,13 @@ jobs:
- name: Upload artifacts debug - name: Upload artifacts debug
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: ${{ format('{0}{1}.zip', 'godot-template-windows-debug', env.GODOT_MONO_UPLOAD_SUFFIX) }} name: ${{ format('{0}-{1}{2}.zip', 'godot-template-windows-debug', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
path: spine-godot/godot/bin/windows_debug_x86_64.exe path: spine-godot/godot/bin/windows_debug_x86_64.exe
- name: Upload artifacts release - name: Upload artifacts release
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: ${{ format('{0}{1}.zip', 'godot-template-windows-release', env.GODOT_MONO_UPLOAD_SUFFIX) }} name: ${{ format('{0}-{1}{2}.zip', 'godot-template-windows-release', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
path: spine-godot/godot/bin/windows_release_x86_64.exe path: spine-godot/godot/bin/windows_release_x86_64.exe
godot-template-android: godot-template-android:
@ -249,19 +249,19 @@ jobs:
- name: Upload artifacts debug - name: Upload artifacts debug
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: ${{ format('{0}{1}.zip', 'godot-template-android-debug', env.GODOT_MONO_UPLOAD_SUFFIX) }} name: ${{ format('{0}-{1}{2}.zip', 'godot-template-android-debug', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
path: spine-godot/godot/bin/android_debug.apk path: spine-godot/godot/bin/android_debug.apk
- name: Upload artifacts release - name: Upload artifacts release
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: ${{ format('{0}{1}.zip', 'godot-template-android-release', env.GODOT_MONO_UPLOAD_SUFFIX) }} name: ${{ format('{0}-{1}{2}.zip', 'godot-template-android-release', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
path: spine-godot/godot/bin/android_release.apk path: spine-godot/godot/bin/android_release.apk
- name: Upload artifacts source - name: Upload artifacts source
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: ${{ format('{0}{1}.zip', 'godot-template-android-source', env.GODOT_MONO_UPLOAD_SUFFIX) }} name: ${{ format('{0}-{1}{2}.zip', 'godot-template-android-source', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
path: spine-godot/godot/bin/android_source.zip path: spine-godot/godot/bin/android_source.zip
godot-template-web: godot-template-web:
@ -293,13 +293,13 @@ jobs:
- name: Upload artifacts debug - name: Upload artifacts debug
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: ${{ format('{0}{1}.zip', 'godot-template-web-debug', env.GODOT_MONO_UPLOAD_SUFFIX) }} name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-debug', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
path: spine-godot/godot/bin/web_debug.zip path: spine-godot/godot/bin/web_debug.zip
- name: Upload artifacts release - name: Upload artifacts release
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: ${{ format('{0}{1}.zip', 'godot-template-web-release', env.GODOT_MONO_UPLOAD_SUFFIX) }} name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-release', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
path: spine-godot/godot/bin/web_release.zip path: spine-godot/godot/bin/web_release.zip
upload-to-s3: upload-to-s3:
@ -311,72 +311,72 @@ jobs:
- name: Download godot-editor-windows artifact - name: Download godot-editor-windows artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-editor-windows.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-editor-windows', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Download godot-editor-linux artifact - name: Download godot-editor-linux artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-editor-linux.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-editor-linux', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Download godot-editor-macos artifact - name: Download godot-editor-macos artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-editor-macos.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-editor-macos.zip', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Download godot-template-ios artifact - name: Download godot-template-ios artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-template-ios.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-template-ios.zip', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Download godot-template-macos artifact - name: Download godot-template-macos artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-template-macos.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-template-macos.zip', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Download godot-template-windows-release artifact - name: Download godot-template-windows-release artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-template-windows-release.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-template-windows-release.zip', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Download godot-template-windows-debug artifact - name: Download godot-template-windows-debug artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-template-windows-debug.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-template-windows-debug.zip', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Download godot-template-linux-release artifact - name: Download godot-template-linux-release artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-template-linux-release.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-template-linux-release.zip', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Download godot-template-linux-debug artifact - name: Download godot-template-linux-debug artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-template-linux-debug.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-template-linux-debug.zip', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Download godot-template-android-release artifact - name: Download godot-template-android-release artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-template-android-release.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-template-android-release.zip', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Download godot-template-android-debug artifact - name: Download godot-template-android-debug artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-template-android-debug.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-template-android-debug.zip', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Download godot-template-android-source artifact - name: Download godot-template-android-source artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-template-android-source.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-template-android-source.zip', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Download godot-template-web-release artifact - name: Download godot-template-web-release artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-template-web-release.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-release.zip', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Download godot-template-web-debug artifact - name: Download godot-template-web-debug artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-template-web-debug.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-debug.zip', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Upload artifacts to S3 - name: Upload artifacts to S3
shell: bash shell: bash
@ -405,42 +405,42 @@ jobs:
- name: Download godot-editor-windows artifact - name: Download godot-editor-windows artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-editor-windows-mono.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-editor-windows', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Download godot-editor-linux artifact - name: Download godot-editor-linux artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-editor-linux-mono.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-editor-linux', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Download godot-editor-macos artifact - name: Download godot-editor-macos artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-editor-macos-mono.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-editor-macos.zip', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Download godot-template-macos artifact - name: Download godot-template-macos artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-template-macos-mono.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-template-macos.zip', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Download godot-template-windows-release artifact - name: Download godot-template-windows-release artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-template-windows-release-mono.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-template-windows-release.zip', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Download godot-template-windows-debug artifact - name: Download godot-template-windows-debug artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-template-windows-debug-mono.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-template-windows-debug.zip', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Download godot-template-linux-release artifact - name: Download godot-template-linux-release artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-template-linux-release-mono.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-template-linux-release.zip', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Download godot-template-linux-debug artifact - name: Download godot-template-linux-debug artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: godot-template-linux-debug-mono.zip name: ${{ format('{0}-{1}{2}.zip', 'godot-template-linux-debug.zip', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
- name: Upload artifacts to S3 - name: Upload artifacts to S3
shell: bash shell: bash

2
spine-godot/build/build-v4.sh
View File

@ -101,7 +101,7 @@ else
scons $target $mono_module compiledb=yes custom_modules="../spine_godot" opengl3=yes --jobs=$cpus scons $target $mono_module compiledb=yes custom_modules="../spine_godot" opengl3=yes --jobs=$cpus
if [ $mono == "true" ]; then if [ $mono == "true" ]; then
echo "Building C# glue and assemblies." echo "Building C# glue and assemblies."
"./bin/$godot_exe_host" --generate-mono-glue modules/mono/glue "./bin/$godot_exe_host" --headless --generate-mono-glue modules/mono/glue
./modules/mono/build_scripts/build_assemblies.py --godot-output-dir ./bin --push-nupkgs-local ../godot-nuget ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir ./bin --push-nupkgs-local ../godot-nuget
fi fi
cp compile_commands.json ../build cp compile_commands.json ../build