diff options
Diffstat (limited to '.ci/scripts/windows')
| -rw-r--r-- | .ci/scripts/windows/upload.ps1 | 9 | ||||
| -rw-r--r-- | .ci/scripts/windows/upload.sh | 10 |
2 files changed, 3 insertions, 16 deletions
diff --git a/.ci/scripts/windows/upload.ps1 b/.ci/scripts/windows/upload.ps1 index 9fb99eaa3..3cb709924 100644 --- a/.ci/scripts/windows/upload.ps1 +++ b/.ci/scripts/windows/upload.ps1 @@ -1,13 +1,6 @@ -param($BUILD_NAME) - $GITDATE = $(git show -s --date=short --format='%ad') -replace "-","" $GITREV = $(git show -s --format='%h') - -if ("$BUILD_NAME" -eq "mainline") { - $RELEASE_DIST = "yuzu-windows-msvc-$BUILD_NAME" -} else { - $RELEASE_DIST = "yuzu-windows-msvc" -} +$RELEASE_DIST = "yuzu-windows-msvc" $MSVC_BUILD_ZIP = "yuzu-windows-msvc-$GITDATE-$GITREV.zip" -replace " ", "" $MSVC_BUILD_PDB = "yuzu-windows-msvc-$GITDATE-$GITREV-debugsymbols.zip" -replace " ", "" diff --git a/.ci/scripts/windows/upload.sh b/.ci/scripts/windows/upload.sh index 41d87159f..de73d3541 100644 --- a/.ci/scripts/windows/upload.sh +++ b/.ci/scripts/windows/upload.sh @@ -6,14 +6,8 @@ REV_NAME="yuzu-windows-mingw-${GITDATE}-${GITREV}" ARCHIVE_NAME="${REV_NAME}.tar.gz" COMPRESSION_FLAGS="-czvf" -if [ "${RELEASE_NAME}" = "mainline" ]; then - DIR_NAME="${REV_NAME}_${RELEASE_NAME}" -else - DIR_NAME="${REV_NAME}" -fi - -mkdir "$DIR_NAME" +mkdir "$REV_NAME" # get around the permission issues -cp -r package/* "$DIR_NAME" +cp -r package/* "$REV_NAME" . .ci/scripts/common/post-upload.sh |