From cf518f4944df6ea1e42f0919b2718b3118582875 Mon Sep 17 00:00:00 2001 From: jpark37 Date: Fri, 17 Sep 2021 01:51:14 -0700 Subject: [PATCH] CI: Fix double zip by uploading build folders --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 580c67c54..6846e1a88 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -571,16 +571,16 @@ jobs: if: success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1') run: | $env:FILE_DATE=(Get-Date -UFormat "%F") - $env:FILE_NAME="${env:FILE_DATE}-${{ env.OBS_GIT_HASH }}-${{ env.OBS_GIT_TAG }}-win64.zip" + $env:FILE_NAME="${env:FILE_DATE}-${{ env.OBS_GIT_HASH }}-${{ env.OBS_GIT_TAG }}-win64" echo "FILE_NAME=${env:FILE_NAME}" >> ${env:GITHUB_ENV} robocopy .\build64\rundir\RelWithDebInfo .\build\ /E /XF .gitignore - 7z a ${env:FILE_NAME} .\build\* + 7z - name: 'Publish' if: success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1') uses: actions/upload-artifact@v2.2.0 with: name: '${{ env.FILE_NAME }}' - path: '*-win64.zip' + path: build/* win32: name: 'Windows 32-bit' runs-on: [windows-latest] @@ -680,13 +680,13 @@ jobs: if: success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1') run: | $env:FILE_DATE=(Get-Date -UFormat "%F") - $env:FILE_NAME="${env:FILE_DATE}-${{ env.OBS_GIT_HASH }}-${{ env.OBS_GIT_TAG }}-win32.zip" + $env:FILE_NAME="${env:FILE_DATE}-${{ env.OBS_GIT_HASH }}-${{ env.OBS_GIT_TAG }}-win32" echo "FILE_NAME=${env:FILE_NAME}" >> ${env:GITHUB_ENV} robocopy .\build32\rundir\RelWithDebInfo .\build\ /E /XF .gitignore - 7z a ${env:FILE_NAME} .\build\* + 7z - name: 'Publish' if: success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1') uses: actions/upload-artifact@v2.2.0 with: name: '${{ env.FILE_NAME }}' - path: '*-win32.zip' + path: build/*