diff options
| author | bunnei <bunneidev@gmail.com> | 2019-11-07 03:37:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-07 03:37:01 +0100 |
| commit | 63d30133f8b6135670dbeccecaf39ac5633be8b0 (patch) | |
| tree | 7c184e88467e0851f23f5b88b67b3873fe03f179 | |
| parent | Merge pull request #3057 from ReinUsesLisp/buffer-sub-data (diff) | |
| parent | Revert "ci: Rename build folder only on non-mainline builds" (diff) | |
| download | yuzu-63d30133f8b6135670dbeccecaf39ac5633be8b0.tar yuzu-63d30133f8b6135670dbeccecaf39ac5633be8b0.tar.gz yuzu-63d30133f8b6135670dbeccecaf39ac5633be8b0.tar.bz2 yuzu-63d30133f8b6135670dbeccecaf39ac5633be8b0.tar.lz yuzu-63d30133f8b6135670dbeccecaf39ac5633be8b0.tar.xz yuzu-63d30133f8b6135670dbeccecaf39ac5633be8b0.tar.zst yuzu-63d30133f8b6135670dbeccecaf39ac5633be8b0.zip | |
| -rw-r--r-- | .ci/scripts/common/post-upload.sh | 8 | ||||
| -rw-r--r-- | .ci/scripts/linux/upload.sh | 12 | ||||
| -rw-r--r-- | .ci/scripts/windows/upload.ps1 | 9 | ||||
| -rw-r--r-- | .ci/scripts/windows/upload.sh | 10 | ||||
| -rw-r--r-- | .ci/templates/build-msvc.yml | 1 |
5 files changed, 10 insertions, 30 deletions
diff --git a/.ci/scripts/common/post-upload.sh b/.ci/scripts/common/post-upload.sh index b80868635..bb4e9d328 100644 --- a/.ci/scripts/common/post-upload.sh +++ b/.ci/scripts/common/post-upload.sh @@ -1,12 +1,12 @@ #!/bin/bash -ex # Copy documentation -cp license.txt "$DIR_NAME" -cp README.md "$DIR_NAME" +cp license.txt "$REV_NAME" +cp README.md "$REV_NAME" -tar $COMPRESSION_FLAGS "$ARCHIVE_NAME" "$DIR_NAME" +tar $COMPRESSION_FLAGS "$ARCHIVE_NAME" "$REV_NAME" -mv "$DIR_NAME" $RELEASE_NAME +mv "$REV_NAME" $RELEASE_NAME 7z a "$REV_NAME.7z" $RELEASE_NAME diff --git a/.ci/scripts/linux/upload.sh b/.ci/scripts/linux/upload.sh index ecd77e267..0d131d1dd 100644 --- a/.ci/scripts/linux/upload.sh +++ b/.ci/scripts/linux/upload.sh @@ -6,15 +6,9 @@ REV_NAME="yuzu-linux-${GITDATE}-${GITREV}" ARCHIVE_NAME="${REV_NAME}.tar.xz" COMPRESSION_FLAGS="-cJvf" -if [ "${RELEASE_NAME}" = "mainline" ]; then - DIR_NAME="${REV_NAME}_${RELEASE_NAME}" -else - DIR_NAME="${REV_NAME}" -fi +mkdir "$REV_NAME" -mkdir "$DIR_NAME" - -cp build/bin/yuzu-cmd "$DIR_NAME" -cp build/bin/yuzu "$DIR_NAME" +cp build/bin/yuzu-cmd "$REV_NAME" +cp build/bin/yuzu "$REV_NAME" . .ci/scripts/common/post-upload.sh 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 diff --git a/.ci/templates/build-msvc.yml b/.ci/templates/build-msvc.yml index 52cebaee0..b44a08247 100644 --- a/.ci/templates/build-msvc.yml +++ b/.ci/templates/build-msvc.yml @@ -17,7 +17,6 @@ steps: inputs: targetType: 'filePath' filePath: './.ci/scripts/windows/upload.ps1' - arguments: '$(BuildName)' - publish: artifacts artifact: 'yuzu-$(BuildName)-windows-msvc' displayName: 'Upload Artifacts' |