From 355a296aa13568938630e05c08dd2682a273d2bc Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Sat, 2 Aug 2025 14:25:23 +0300 Subject: [PATCH 1/2] Enable uploading of x86 and arm windows builds to downloads.vcmi.eu --- .github/workflows/github.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/github.yml b/.github/workflows/github.yml index 5d4b5d45c..023e38f06 100644 --- a/.github/workflows/github.yml +++ b/.github/workflows/github.yml @@ -87,6 +87,7 @@ jobs: os: windows-latest test: 0 pack: 0 + upload: 1 pack_type: RelWithDebInfo extension: exe before_install: msvc.sh @@ -96,6 +97,7 @@ jobs: os: windows-11-arm test: 0 pack: 0 + upload: 1 pack_type: RelWithDebInfo extension: exe before_install: msvc.sh From cf72f8f485394e38db533f383fd814b5ee10c50c Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Sat, 2 Aug 2025 14:42:34 +0300 Subject: [PATCH 2/2] cd to correct directory before uploading windows build --- .github/workflows/github.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github.yml b/.github/workflows/github.yml index 023e38f06..e764e9abf 100644 --- a/.github/workflows/github.yml +++ b/.github/workflows/github.yml @@ -313,7 +313,7 @@ jobs: "${{ env.VCMI_PACKAGE_BUILD }}" "${{ matrix.arch }}" "VCMI ${{ env.VCMI_PACKAGE_NAME_SUFFIX }}" - "${{ env.VCMI_PACKAGE_FILE_NAME }}-${{ matrix.arch }}" + "${{ env.VCMI_PACKAGE_FILE_NAME }}" "${{ github.workspace }}\out\build\${{ matrix.preset }}\bin\RelWithDebInfo" "${{ github.workspace }}\ucrt" shell: cmd @@ -392,7 +392,9 @@ jobs: if: ${{ (matrix.upload == 1) && (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/beta' || github.ref == 'refs/heads/master') }} continue-on-error: true run: | - if [ -z '${{ env.ANDROID_APK_PATH }}' ] ; then + if [[ ${{startsWith(matrix.platform, 'msvc') }} ]] ; then + cd '${{github.workspace}}/CI/wininstaller/Output' + elif [ -z '${{ env.ANDROID_APK_PATH }}' ] ; then cd '${{github.workspace}}/out/build/${{matrix.preset}}' fi source '${{github.workspace}}/CI/upload_package.sh'