diff options
| author | James Rowe <jroweboy@gmail.com> | 2019-10-24 12:46:15 -0600 |
|---|---|---|
| committer | James Rowe <jroweboy@gmail.com> | 2019-10-24 12:46:15 -0600 |
| commit | 969f0afa4e8da7d92462105ed34ccd6da87130d5 (patch) | |
| tree | 259446ffaf570b2bd2cc78c1b4615b0de6e1fb8d /.ci/scripts/windows | |
| parent | 5062728669108f5160f29d552e3cee64e88e4cf1 (diff) | |
Revert "ci: Add build name to archive root folder"
This reverts commit 5e553a6c267f4ab96a89833f1006ea27fd78b30a.
Diffstat (limited to '.ci/scripts/windows')
| -rw-r--r-- | .ci/scripts/windows/upload.ps1 | 4 | ||||
| -rw-r--r-- | .ci/scripts/windows/upload.sh | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/.ci/scripts/windows/upload.ps1 b/.ci/scripts/windows/upload.ps1 index 2371a7d4a..3cb709924 100644 --- a/.ci/scripts/windows/upload.ps1 +++ b/.ci/scripts/windows/upload.ps1 @@ -1,8 +1,6 @@ -param($BUILD_NAME) - $GITDATE = $(git show -s --date=short --format='%ad') -replace "-","" $GITREV = $(git show -s --format='%h') -$RELEASE_DIST = "yuzu-windows-msvc-$BUILD_NAME" +$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 3f5794ae6..de73d3541 100644 --- a/.ci/scripts/windows/upload.sh +++ b/.ci/scripts/windows/upload.sh @@ -5,10 +5,9 @@ REV_NAME="yuzu-windows-mingw-${GITDATE}-${GITREV}" ARCHIVE_NAME="${REV_NAME}.tar.gz" COMPRESSION_FLAGS="-czvf" -DIR_NAME="${REV_NAME}_${RELEASE_NAME}" -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 |