million/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

Revert "ci: Add build name to archive root folder"

Browse source 
This reverts commit 5e553a6c26.
This commit is contained in:
James Rowe 2019-10-24 12:46:15 -06:00
parent 5062728669
commit 969f0afa4e
5 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.ci/scripts/common/post-upload.sh
View file

@ -1,12 +1,12 @@
#!/bin/bash -ex #!/bin/bash -ex
# Copy documentation # Copy documentation
cp license.txt "$DIR_NAME" cp license.txt "$REV_NAME"
cp README.md "$DIR_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 7z a "$REV_NAME.7z" $RELEASE_NAME

7
.ci/scripts/linux/upload.sh
View file

@ -5,11 +5,10 @@
REV_NAME="yuzu-linux-${GITDATE}-${GITREV}" REV_NAME="yuzu-linux-${GITDATE}-${GITREV}"
ARCHIVE_NAME="${REV_NAME}.tar.xz" ARCHIVE_NAME="${REV_NAME}.tar.xz"
COMPRESSION_FLAGS="-cJvf" COMPRESSION_FLAGS="-cJvf"
DIR_NAME="${REV_NAME}_${RELEASE_NAME}"
mkdir "$DIR_NAME" mkdir "$REV_NAME"
cp build/bin/yuzu-cmd "$DIR_NAME" cp build/bin/yuzu-cmd "$REV_NAME"
cp build/bin/yuzu "$DIR_NAME" cp build/bin/yuzu "$REV_NAME"
. .ci/scripts/common/post-upload.sh . .ci/scripts/common/post-upload.sh

4
.ci/scripts/windows/upload.ps1
View file

@ -1,8 +1,6 @@
param($BUILD_NAME)
$GITDATE = $(git show -s --date=short --format='%ad') -replace "-","" $GITDATE = $(git show -s --date=short --format='%ad') -replace "-",""
$GITREV = $(git show -s --format='%h') $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_ZIP = "yuzu-windows-msvc-$GITDATE-$GITREV.zip" -replace " ", ""
$MSVC_BUILD_PDB = "yuzu-windows-msvc-$GITDATE-$GITREV-debugsymbols.zip" -replace " ", "" $MSVC_BUILD_PDB = "yuzu-windows-msvc-$GITDATE-$GITREV-debugsymbols.zip" -replace " ", ""

5
.ci/scripts/windows/upload.sh
View file

@ -5,10 +5,9 @@
REV_NAME="yuzu-windows-mingw-${GITDATE}-${GITREV}" REV_NAME="yuzu-windows-mingw-${GITDATE}-${GITREV}"
ARCHIVE_NAME="${REV_NAME}.tar.gz" ARCHIVE_NAME="${REV_NAME}.tar.gz"
COMPRESSION_FLAGS="-czvf" COMPRESSION_FLAGS="-czvf"
DIR_NAME="${REV_NAME}_${RELEASE_NAME}"
mkdir "$DIR_NAME" mkdir "$REV_NAME"
# get around the permission issues # get around the permission issues
cp -r package/* "$DIR_NAME" cp -r package/* "$REV_NAME"
. .ci/scripts/common/post-upload.sh . .ci/scripts/common/post-upload.sh

1
.ci/templates/build-msvc.yml
View file

@ -17,7 +17,6 @@ steps:
inputs: inputs:
targetType: 'filePath' targetType: 'filePath'
filePath: './.ci/scripts/windows/upload.ps1' filePath: './.ci/scripts/windows/upload.ps1'
arguments: '$(BuildName)'
- publish: artifacts - publish: artifacts
artifact: 'yuzu-$(BuildName)-windows-msvc' artifact: 'yuzu-$(BuildName)-windows-msvc'
displayName: 'Upload Artifacts' displayName: 'Upload Artifacts'