From 4882bc9bda9d593075e812d1f6defe3fc21b74df Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 3 Oct 2021 06:25:42 -0400
Subject: [PATCH] Revert "Change linux package format to .tar.xz"
This reverts commit ef42f594d857b849385bdaebe40273be568bdf35.
---
.gitlab-ci.yml | 4 ++--
indra/newview/viewer_manifest.py | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d1a55f00b6..df085fcbe12 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -167,7 +167,7 @@ variables:
- build-linux-*/packages/lib/release/libopenal.so*
- build-linux-*/packages/lib/release/libopenjp2.so*
- build-linux-*/packages/lib/release/libSDL2*.so*
- - build-linux-*/newview/Alchemy_*.tar.xz
+ - build-linux-*/newview/Alchemy_*.tar.*
- build-linux-*/newview/alchemy-bin
- build-linux-*/newview/alchemy-bin.debug
- build-linux-*/newview/alchemy-bin.src.zip
@@ -396,7 +396,7 @@ build:release:windows64:
Push-Location ./build-linux-64/
Push-Location ./newview/
- $FileNameLnx64 = Get-ChildItem -Path . -Name -Include Alchemy_*.tar.xz
+ $FileNameLnx64 = Get-ChildItem -Path . -Name -Include Alchemy_*.tar.*
Invoke-WebRequest @UploadParams -InFile ./$FileNameLnx64 -Uri "${UploadDestURL}/${FileNameLnx64}"
If ($env:USE_SENTRY -eq 'TRUE')
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 9d6f11069a7..6ab030c5919 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1167,7 +1167,7 @@ def package_finish(self):
self.run_command(['find', self.get_dst_prefix(),
'-type', 'f', '-perm', old,
'-exec', 'chmod', new, '{}', ';'])
- self.package_file = installer_name + '.tar.xz'
+ self.package_file = installer_name + '.tar.bz2'
# temporarily move directory tree so that it has the right
# name in the tarfile
@@ -1180,10 +1180,10 @@ def package_finish(self):
# --numeric-owner hides the username of the builder for
# security etc.
self.run_command(['tar', '-C', self.get_build_prefix(),
- '--numeric-owner', '-cJf',
- tempname + '.tar.xz', installer_name])
+ '--numeric-owner', '-cjf',
+ tempname + '.tar.bz2', installer_name])
else:
- print("Skipping %s.tar.xz for non-Release build (%s)" % \
+ print("Skipping %s.tar.bz2 for non-Release build (%s)" % \
(installer_name, self.args['buildtype']))
finally:
self.run_command(["mv", tempname, realname])
--
GitLab