diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4d1a55f00b616dc7e00a3001ce1f5a7ab37fc311..df085fcbe1285abd71646123b7c8aca75f818b4e 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 9d6f11069a74deec6a04f881772113262c54a1e7..6ab030c5919a3edd594a0cd6a4593efa8bdfc147 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])