diff options
author | bunnei <bunneidev@gmail.com> | 2019-11-06 03:10:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-06 03:10:44 +0100 |
commit | 9a62f5351a0e7c97410fb295169cb9f1df0abff0 (patch) | |
tree | 2e32340d5ee6f299e00887c467ef0db76fa3afab /.ci/scripts/windows | |
parent | Merge pull request #2859 from Morph1984/hid (diff) | |
parent | ci: Rename build folder only on non-mainline builds (diff) | |
download | yuzu-9a62f5351a0e7c97410fb295169cb9f1df0abff0.tar yuzu-9a62f5351a0e7c97410fb295169cb9f1df0abff0.tar.gz yuzu-9a62f5351a0e7c97410fb295169cb9f1df0abff0.tar.bz2 yuzu-9a62f5351a0e7c97410fb295169cb9f1df0abff0.tar.lz yuzu-9a62f5351a0e7c97410fb295169cb9f1df0abff0.tar.xz yuzu-9a62f5351a0e7c97410fb295169cb9f1df0abff0.tar.zst yuzu-9a62f5351a0e7c97410fb295169cb9f1df0abff0.zip |
Diffstat (limited to '')
-rw-r--r-- | .ci/scripts/windows/upload.ps1 | 9 | ||||
-rw-r--r-- | .ci/scripts/windows/upload.sh | 10 |
2 files changed, 16 insertions, 3 deletions
diff --git a/.ci/scripts/windows/upload.ps1 b/.ci/scripts/windows/upload.ps1 index 3cb709924..9fb99eaa3 100644 --- a/.ci/scripts/windows/upload.ps1 +++ b/.ci/scripts/windows/upload.ps1 @@ -1,6 +1,13 @@ +param($BUILD_NAME) + $GITDATE = $(git show -s --date=short --format='%ad') -replace "-","" $GITREV = $(git show -s --format='%h') -$RELEASE_DIST = "yuzu-windows-msvc" + +if ("$BUILD_NAME" -eq "mainline") { + $RELEASE_DIST = "yuzu-windows-msvc-$BUILD_NAME" +} else { + $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 de73d3541..41d87159f 100644 --- a/.ci/scripts/windows/upload.sh +++ b/.ci/scripts/windows/upload.sh @@ -6,8 +6,14 @@ REV_NAME="yuzu-windows-mingw-${GITDATE}-${GITREV}" ARCHIVE_NAME="${REV_NAME}.tar.gz" COMPRESSION_FLAGS="-czvf" -mkdir "$REV_NAME" +if [ "${RELEASE_NAME}" = "mainline" ]; then + DIR_NAME="${REV_NAME}_${RELEASE_NAME}" +else + DIR_NAME="${REV_NAME}" +fi + +mkdir "$DIR_NAME" # get around the permission issues -cp -r package/* "$REV_NAME" +cp -r package/* "$DIR_NAME" . .ci/scripts/common/post-upload.sh |