Compare commits

...

3 Commits

Author SHA1 Message Date
Serhii Snitsaruk f232069dc4
Merge pull request #199 from limbonaut/gha-fix-dotnet-template-version
GHA: .NET build workflow fixes
2024-08-17 14:21:53 +02:00
Serhii Snitsaruk 6fabad213e
GHA: Fix nuget versions in linux and macos builds 2024-08-16 23:27:58 +02:00
Serhii Snitsaruk cc3d650d23
Fix .NET incorrect template version in version.txt 2024-08-16 20:20:22 +02:00
5 changed files with 25 additions and 13 deletions

View File

@ -40,34 +40,42 @@ jobs:
- name: Template (arm64, debug) - name: Template (arm64, debug)
arch: arm64 arch: arm64
target: template_debug target: template_debug
dotnet: false
- name: Template (arm64, release) - name: Template (arm64, release)
arch: arm64 arch: arm64
target: template_release target: template_release
dotnet: false
- name: Template (arm32, debug) - name: Template (arm32, debug)
arch: arm32 arch: arm32
target: template_debug target: template_debug
dotnet: false
- name: Template (arm32, release) - name: Template (arm32, release)
arch: arm32 arch: arm32
target: template_release target: template_release
dotnet: false
- name: Template (x86_64, debug) - name: Template (x86_64, debug)
arch: x86_64 arch: x86_64
target: template_debug target: template_debug
dotnet: false
- name: Template (x86_64, release) - name: Template (x86_64, release)
arch: x86_64 arch: x86_64
target: template_release target: template_release
dotnet: false
- name: Template (x86_32, debug) - name: Template (x86_32, debug)
arch: x86_32 arch: x86_32
target: template_debug target: template_debug
dotnet: false
- name: Template (x86_32, release) - name: Template (x86_32, release)
arch: x86_32 arch: x86_32
target: template_release target: template_release
dotnet: false
env: env:
BIN: godot.linuxbsd.${{matrix.target}}.${{matrix.arch}} #${{ matrix.build-mono == true && '.mono' || '' }} BIN: godot.linuxbsd.${{matrix.target}}.${{matrix.arch}} #${{ matrix.build-mono == true && '.mono' || '' }}
@ -180,7 +188,7 @@ jobs:
mkdir -p out/templates/ mkdir -p out/templates/
mv bin/android_* out/templates/ mv bin/android_* out/templates/
echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}" > out/templates/version.txt echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}${{matrix.dotnet == true && '.mono' || ''}}" > out/templates/version.txt
ls -l out/* ls -l out/*
- name: Delete Android template builds - name: Delete Android template builds

View File

@ -42,21 +42,25 @@ jobs:
target: template_release target: template_release
arch: arm64 arch: arm64
ios_simulator: false ios_simulator: false
dotnet: false
- name: Template (arm64, debug) - name: Template (arm64, debug)
target: template_debug target: template_debug
arch: arm64 arch: arm64
ios_simulator: false ios_simulator: false
dotnet: false
- name: Simulator Lib (x86_64, release) - name: Simulator Lib (x86_64, release)
target: template_release target: template_release
arch: x86_64 arch: x86_64
ios_simulator: true ios_simulator: true
dotnet: false
- name: Simulator Lib (x86_64, debug) - name: Simulator Lib (x86_64, debug)
target: template_debug target: template_debug
arch: x86_64 arch: x86_64
ios_simulator: true ios_simulator: true
dotnet: false
# ! Disabled for now as it doesn't work with cctools-port and current LLVM. # ! Disabled for now as it doesn't work with cctools-port and current LLVM.
# * See https://github.com/godotengine/build-containers/pull/85. # * See https://github.com/godotengine/build-containers/pull/85.
@ -185,7 +189,7 @@ jobs:
cd ios_xcode cd ios_xcode
zip -q -9 -r ${{github.workspace}}/out/templates/ios.zip * zip -q -9 -r ${{github.workspace}}/out/templates/ios.zip *
echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}" > ${{github.workspace}}/out/templates/version.txt echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}${{matrix.dotnet == true && '.mono' || ''}}" > ${{github.workspace}}/out/templates/version.txt
ls -l ${{github.workspace}}/out/* ls -l ${{github.workspace}}/out/*

View File

@ -245,16 +245,16 @@ jobs:
- name: Generate C# glue - name: Generate C# glue
if: matrix.opts.dotnet && matrix.opts.target == 'editor' if: matrix.opts.dotnet && matrix.opts.target == 'editor'
env:
GODOT_VERSION_STATUS: limboai
run: | run: |
GODOT_VERSION_STATUS=$(echo "${GODOT_VERSION_STATUS}" | sed "s|+|-|")
echo "GODOT_VERSION_STATUS: ${GODOT_VERSION_STATUS}"
./bin/$BIN --headless --generate-mono-glue ./modules/mono/glue || true ./bin/$BIN --headless --generate-mono-glue ./modules/mono/glue || true
- name: Build .NET solutions - name: Build .NET solutions
if: matrix.opts.dotnet && matrix.opts.target == 'editor' if: matrix.opts.dotnet && matrix.opts.target == 'editor'
env:
GODOT_VERSION_STATUS: limboai
run: | run: |
GODOT_VERSION_STATUS=$(echo "${GODOT_VERSION_STATUS}" | sed "s|+|-|")
echo "GODOT_VERSION_STATUS: ${GODOT_VERSION_STATUS}"
./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd
- name: Prepare artifact - name: Prepare artifact
@ -285,7 +285,7 @@ jobs:
BUILD_TYPE: ${{ endsWith(matrix.opts.target, 'release') && 'release' || 'debug' }} BUILD_TYPE: ${{ endsWith(matrix.opts.target, 'release') && 'release' || 'debug' }}
run: | run: |
mv out/templates/${BIN} out/templates/linux_${BUILD_TYPE}.${{matrix.opts.arch}} mv out/templates/${BIN} out/templates/linux_${BUILD_TYPE}.${{matrix.opts.arch}}
echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}" > out/templates/version.txt echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}${{matrix.opts.dotnet == true && '.mono' || ''}}" > out/templates/version.txt
ls -R out/ ls -R out/
- name: Upload artifact - name: Upload artifact

View File

@ -185,16 +185,16 @@ jobs:
- name: Generate C# glue - name: Generate C# glue
if: matrix.opts.dotnet && matrix.opts.target == 'editor' && matrix.opts.arch == 'x86_64' if: matrix.opts.dotnet && matrix.opts.target == 'editor' && matrix.opts.arch == 'x86_64'
env:
GODOT_VERSION_STATUS: limboai
run: | run: |
GODOT_VERSION_STATUS=$(echo "${GODOT_VERSION_STATUS}" | sed "s|+|-|")
echo "GODOT_VERSION_STATUS: ${GODOT_VERSION_STATUS}"
./bin/$BIN --headless --generate-mono-glue ./modules/mono/glue || true ./bin/$BIN --headless --generate-mono-glue ./modules/mono/glue || true
- name: Build .NET solutions - name: Build .NET solutions
if: matrix.opts.dotnet && matrix.opts.target == 'editor' && matrix.opts.arch == 'x86_64' if: matrix.opts.dotnet && matrix.opts.target == 'editor' && matrix.opts.arch == 'x86_64'
env:
GODOT_VERSION_STATUS: limboai
run: | run: |
GODOT_VERSION_STATUS=$(echo "${GODOT_VERSION_STATUS}" | sed "s|+|-|")
echo "GODOT_VERSION_STATUS: ${GODOT_VERSION_STATUS}"
./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=macos ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=macos
- name: Prepare artifact - name: Prepare artifact
@ -299,7 +299,7 @@ jobs:
zip -q -9 -r macos.zip macos_template.app zip -q -9 -r macos.zip macos_template.app
mkdir -p out/templates/ mkdir -p out/templates/
mv macos.zip out/templates/macos.zip mv macos.zip out/templates/macos.zip
echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}" > out/templates/version.txt echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}${{matrix.opts.dotnet == true && '.mono' || ''}}" > out/templates/version.txt
rm -rf bin/* rm -rf bin/*
ls out/templates/ ls out/templates/

View File

@ -254,7 +254,7 @@ jobs:
run: | run: |
mv out/templates/${BIN}.exe out/templates/windows_${BUILD_TYPE}_${{matrix.opts.arch}}.exe mv out/templates/${BIN}.exe out/templates/windows_${BUILD_TYPE}_${{matrix.opts.arch}}.exe
mv out/templates/${BIN}.console.exe out/templates/windows_${BUILD_TYPE}_${{matrix.opts.arch}}_console.exe mv out/templates/${BIN}.console.exe out/templates/windows_${BUILD_TYPE}_${{matrix.opts.arch}}_console.exe
echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}" > out/templates/version.txt echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}${{matrix.opts.dotnet == true && '.mono' || ''}}" > out/templates/version.txt
ls -R out/ ls -R out/
- name: Upload artifact - name: Upload artifact