diff options
Diffstat (limited to '')
| -rw-r--r-- | .ci/scripts/linux/docker.sh | 3 | ||||
| -rw-r--r-- | .ci/scripts/linux/upload.sh | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh index 090ca75f1..5559a527c 100644 --- a/.ci/scripts/linux/docker.sh +++ b/.ci/scripts/linux/docker.sh @@ -11,5 +11,4 @@ ninja ccache -s -# Ignore zlib's tests, since they aren't gated behind a CMake option. -ctest -VV -E "(example|example64)" -C Release +ctest -VV -C Release diff --git a/.ci/scripts/linux/upload.sh b/.ci/scripts/linux/upload.sh index 0d131d1dd..ecd77e267 100644 --- a/.ci/scripts/linux/upload.sh +++ b/.ci/scripts/linux/upload.sh @@ -6,9 +6,15 @@ REV_NAME="yuzu-linux-${GITDATE}-${GITREV}" ARCHIVE_NAME="${REV_NAME}.tar.xz" COMPRESSION_FLAGS="-cJvf" -mkdir "$REV_NAME" +if [ "${RELEASE_NAME}" = "mainline" ]; then + DIR_NAME="${REV_NAME}_${RELEASE_NAME}" +else + DIR_NAME="${REV_NAME}" +fi -cp build/bin/yuzu-cmd "$REV_NAME" -cp build/bin/yuzu "$REV_NAME" +mkdir "$DIR_NAME" + +cp build/bin/yuzu-cmd "$DIR_NAME" +cp build/bin/yuzu "$DIR_NAME" . .ci/scripts/common/post-upload.sh |