From cc3d650d234f0fe869e26068b14d4ef031556cfc Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Fri, 16 Aug 2024 20:20:22 +0200 Subject: [PATCH] Fix .NET incorrect template version in version.txt --- .github/workflows/android.yml | 10 +++++++++- .github/workflows/ios.yml | 6 +++++- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/windows.yml | 2 +- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index ce0352d..40b19af 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -40,34 +40,42 @@ jobs: - name: Template (arm64, debug) arch: arm64 target: template_debug + dotnet: false - name: Template (arm64, release) arch: arm64 target: template_release + dotnet: false - name: Template (arm32, debug) arch: arm32 target: template_debug + dotnet: false - name: Template (arm32, release) arch: arm32 target: template_release + dotnet: false - name: Template (x86_64, debug) arch: x86_64 target: template_debug + dotnet: false - name: Template (x86_64, release) arch: x86_64 target: template_release + dotnet: false - name: Template (x86_32, debug) arch: x86_32 target: template_debug + dotnet: false - name: Template (x86_32, release) arch: x86_32 target: template_release + dotnet: false env: BIN: godot.linuxbsd.${{matrix.target}}.${{matrix.arch}} #${{ matrix.build-mono == true && '.mono' || '' }} @@ -180,7 +188,7 @@ jobs: mkdir -p 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/* - name: Delete Android template builds diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index f804b6d..fed5f9a 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -42,21 +42,25 @@ jobs: target: template_release arch: arm64 ios_simulator: false + dotnet: false - name: Template (arm64, debug) target: template_debug arch: arm64 ios_simulator: false + dotnet: false - name: Simulator Lib (x86_64, release) target: template_release arch: x86_64 ios_simulator: true + dotnet: false - name: Simulator Lib (x86_64, debug) target: template_debug arch: x86_64 ios_simulator: true + dotnet: false # ! Disabled for now as it doesn't work with cctools-port and current LLVM. # * See https://github.com/godotengine/build-containers/pull/85. @@ -185,7 +189,7 @@ jobs: cd ios_xcode 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/* diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index ef813a1..553feed 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -285,7 +285,7 @@ jobs: BUILD_TYPE: ${{ endsWith(matrix.opts.target, 'release') && 'release' || 'debug' }} run: | 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/ - name: Upload artifact diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index a0980ad..b779001 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -299,7 +299,7 @@ jobs: zip -q -9 -r macos.zip macos_template.app mkdir -p out/templates/ 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/* ls out/templates/ diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3176c35..6afcb92 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -254,7 +254,7 @@ jobs: run: | 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 - 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/ - name: Upload artifact