diff options
| author | 2021-06-09 19:47:08 -0400 | |
|---|---|---|
| committer | 2021-06-09 19:47:08 -0400 | |
| commit | 86d832ab9a2896cd6a1ce7231645893390824985 (patch) | |
| tree | 625082f2fa275f29146e00d8e79856e87ebfc4cf | |
| parent | Merge pull request #6440 from bunnei/cancel-synch (diff) | |
| parent | ci: windows: Compress using xz (diff) | |
| download | yuzu-86d832ab9a2896cd6a1ce7231645893390824985.tar.gz yuzu-86d832ab9a2896cd6a1ce7231645893390824985.tar.xz yuzu-86d832ab9a2896cd6a1ce7231645893390824985.zip | |
Merge pull request #6439 from lat9nq/ci-no-7z
ci: common: Remove 7z packaging
| -rw-r--r-- | .ci/scripts/common/post-upload.sh | 6 | ||||
| -rw-r--r-- | .ci/scripts/windows/upload.sh | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/.ci/scripts/common/post-upload.sh b/.ci/scripts/common/post-upload.sh index 99e79fcb6..387431564 100644 --- a/.ci/scripts/common/post-upload.sh +++ b/.ci/scripts/common/post-upload.sh | |||
| @@ -9,11 +9,5 @@ cp "${REV_NAME}-source.tar.xz" "$DIR_NAME" | |||
| 9 | 9 | ||
| 10 | tar $COMPRESSION_FLAGS "$ARCHIVE_NAME" "$DIR_NAME" | 10 | tar $COMPRESSION_FLAGS "$ARCHIVE_NAME" "$DIR_NAME" |
| 11 | 11 | ||
| 12 | mv "$DIR_NAME" $RELEASE_NAME | ||
| 13 | mv "${REV_NAME}-source.tar.xz" $RELEASE_NAME | ||
| 14 | |||
| 15 | 7z a "$REV_NAME.7z" $RELEASE_NAME | ||
| 16 | |||
| 17 | # move the compiled archive into the artifacts directory to be uploaded by travis releases | 12 | # move the compiled archive into the artifacts directory to be uploaded by travis releases |
| 18 | mv "$ARCHIVE_NAME" "${ARTIFACTS_DIR}/" | 13 | mv "$ARCHIVE_NAME" "${ARTIFACTS_DIR}/" |
| 19 | mv "$REV_NAME.7z" "${ARTIFACTS_DIR}/" | ||
diff --git a/.ci/scripts/windows/upload.sh b/.ci/scripts/windows/upload.sh index ebf5b7dc1..3c6a74218 100644 --- a/.ci/scripts/windows/upload.sh +++ b/.ci/scripts/windows/upload.sh | |||
| @@ -3,8 +3,8 @@ | |||
| 3 | . .ci/scripts/common/pre-upload.sh | 3 | . .ci/scripts/common/pre-upload.sh |
| 4 | 4 | ||
| 5 | REV_NAME="yuzu-windows-mingw-${GITDATE}-${GITREV}" | 5 | REV_NAME="yuzu-windows-mingw-${GITDATE}-${GITREV}" |
| 6 | ARCHIVE_NAME="${REV_NAME}.tar.gz" | 6 | ARCHIVE_NAME="${REV_NAME}.tar.xz" |
| 7 | COMPRESSION_FLAGS="-czvf" | 7 | COMPRESSION_FLAGS="-cJvf" |
| 8 | 8 | ||
| 9 | if [ "${RELEASE_NAME}" = "mainline" ]; then | 9 | if [ "${RELEASE_NAME}" = "mainline" ]; then |
| 10 | DIR_NAME="${REV_NAME}" | 10 | DIR_NAME="${REV_NAME}" |