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

Revert "ci: Rename build folder only on non-mainline builds"

Browse source
This commit is contained in:
bunnei 2019-11-06 21:36:50 -05:00 committed by GitHub
parent 468576284d
commit f1e4f3fc0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 30 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

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

@ -6,15 +6,9 @@ REV_NAME="yuzu-linux-${GITDATE}-${GITREV}"
ARCHIVE_NAME="${REV_NAME}.tar.xz" ARCHIVE_NAME="${REV_NAME}.tar.xz"
COMPRESSION_FLAGS="-cJvf" COMPRESSION_FLAGS="-cJvf"
if [ "${RELEASE_NAME}" = "mainline" ]; then mkdir "$REV_NAME"
DIR_NAME="${REV_NAME}_${RELEASE_NAME}"
else
DIR_NAME="${REV_NAME}"
fi
mkdir "$DIR_NAME" cp build/bin/yuzu-cmd "$REV_NAME"
cp build/bin/yuzu "$REV_NAME"
cp build/bin/yuzu-cmd "$DIR_NAME"
cp build/bin/yuzu "$DIR_NAME"
. .ci/scripts/common/post-upload.sh . .ci/scripts/common/post-upload.sh

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

@ -1,13 +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')
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_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 " ", ""

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

@ -6,14 +6,8 @@ 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"
if [ "${RELEASE_NAME}" = "mainline" ]; then mkdir "$REV_NAME"
DIR_NAME="${REV_NAME}_${RELEASE_NAME}"
else
DIR_NAME="${REV_NAME}"
fi
mkdir "$DIR_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'