Use tar.xz on Linux and macOS for artifacts

Author: CrSjimo

.github/actions/initialize-build-environment/action.yml

@@ -34,7 +34,7 @@ runs:
         HOMEBREW_NO_INSTALL_CLEANUP: '1'
       run: |
         brew update
-        brew install ninja ccache autoconf autoconf-archive automake libtool pkgconf bison flex libmagic
+        brew install ninja ccache autoconf autoconf-archive automake libtool pkgconf bison flex libmagic xz
         echo "$(brew --prefix bison)/bin" >> "$GITHUB_PATH"
         echo "$(brew --prefix flex)/bin" >> "$GITHUB_PATH"
 
@@ -44,7 +44,7 @@ runs:
       run: |
         sudo apt-get update
         sudo apt-get install -y \
-          build-essential gcc-14 g++-14 ninja-build ccache patchelf zip unzip curl tar file binutils \
+          build-essential gcc-14 g++-14 ninja-build ccache patchelf zip unzip curl tar xz-utils file binutils \
           autoconf autoconf-archive automake libtool libltdl-dev pkg-config \
           bison flex libmagic-dev
         echo 'CC=gcc-14' >> "$GITHUB_ENV"

.github/scripts/nightly.cjs

@@ -161,11 +161,10 @@ function expectedAssets(applicationName, semver) {
     return [
         ['_Windows_amd64_portable.zip', 'windows', 'amd64', 'zip', 'portable'],
         ['_Windows_amd64_debug_symbols.zip', 'windows', 'amd64', 'zip', 'debug_symbols'],
-        // Enable each platform's entries with its matrix entry in build.yml.
-        // ['_macOS_arm64_portable.zip', 'macos', 'arm64', 'zip', 'portable'],
-        // ['_macOS_arm64_debug_symbols.zip', 'macos', 'arm64', 'zip', 'debug_symbols'],
-        // ['_Linux_amd64_portable.zip', 'linux', 'amd64', 'zip', 'portable'],
-        // ['_Linux_amd64_debug_symbols.zip', 'linux', 'amd64', 'zip', 'debug_symbols'],
+        ['_macOS_arm64_portable.tar.xz', 'macos', 'arm64', 'tar.xz', 'portable'],
+        ['_macOS_arm64_debug_symbols.tar.xz', 'macos', 'arm64', 'tar.xz', 'debug_symbols'],
+        ['_Linux_amd64_portable.tar.xz', 'linux', 'amd64', 'tar.xz', 'portable'],
+        ['_Linux_amd64_debug_symbols.tar.xz', 'linux', 'amd64', 'tar.xz', 'debug_symbols'],
     ].map(([suffix, platform, arch, format, variant]) => ({ name: base + suffix, platform, arch, format, variant }));
 }
 

.github/workflows/build.yml

@@ -84,6 +84,7 @@ jobs:
       EXPECTED_SEMVER: ${{ needs.Prepare.outputs.semver }}
       ARTIFACT_PLATFORM: ${{ matrix.platform }}
       ARTIFACT_ARCH: ${{ matrix.arch }}
+      ARCHIVE_EXTENSION: ${{ matrix.platform == 'Windows' && 'zip' || 'tar.xz' }}
       USE_CCACHE: ${{ inputs.build_type != 'nightly' && inputs.use_cache && inputs.use_ccache }}
     steps:
       - name: Checkout repository
@@ -145,15 +146,15 @@ jobs:
           $output = & ./scripts/ci/Collect-Symbol-Files.ps1 `
             -VcpkgRootDir $env:VCPKG_ROOT_DIR `
             -InstallDir $env:INSTALL_DIR `
-            -ArchivePath "$($env:ARTIFACT_NAME)_debug_symbols.zip"
+            -ArchivePath "$($env:ARTIFACT_NAME)_debug_symbols.$($env:ARCHIVE_EXTENSION)"
           "SYMBOL_FILES_PATH=$output" >> $env:GITHUB_ENV
 
-      - name: Create portable ZIP
+      - name: Create portable archive
         run: |
           $archive = & ./scripts/ci/Create-Portable.ps1 `
             -InstallDir $env:INSTALL_DIR `
             -ApplicationName $env:APPLICATION_NAME `
-            -ArchivePath "$($env:ARTIFACT_NAME)_portable.zip"
+            -ArchivePath "$($env:ARTIFACT_NAME)_portable.$($env:ARCHIVE_EXTENSION)"
           "PORTABLE_PATH=$archive" >> $env:GITHUB_ENV
 
       - name: Upload symbol files
@@ -165,7 +166,7 @@ jobs:
           overwrite: true
           compression-level: 0
 
-      - name: Upload portable ZIP
+      - name: Upload portable archive
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.ARTIFACT_NAME }}_portable

scripts/ci/Collect-Symbol-Files.ps1

@@ -129,13 +129,11 @@ try {
     try {
         if ($IsWindows) {
             & 7z a -tzip -mx=9 $archiveFullPath debug_symbols | Out-Host
-        } elseif ($IsMacOS) {
-            & /usr/bin/ditto -c -k --keepParent --norsrc debug_symbols $archiveFullPath | Out-Host
         } else {
-            & /usr/bin/zip -9 -r -y $archiveFullPath debug_symbols | Out-Host
+            & /usr/bin/tar -cJf $archiveFullPath debug_symbols | Out-Host
         }
         if ($LASTEXITCODE -ne 0 -or -not (Test-Path -LiteralPath $archiveFullPath -PathType Leaf)) {
-            throw 'Symbol ZIP creation failed'
+            throw 'Symbol archive creation failed'
         }
     } finally {
         Pop-Location

scripts/ci/Create-Portable.ps1

@@ -37,13 +37,11 @@ Push-Location $stagingRoot
 try {
     if ($IsWindows) {
         & 7z a -tzip -mx=9 $archiveFullPath $ApplicationName | Out-Host
-    } elseif ($IsMacOS) {
-        & /usr/bin/ditto -c -k --keepParent --norsrc $ApplicationName $archiveFullPath | Out-Host
     } else {
-        & /usr/bin/zip -9 -r -y $archiveFullPath $ApplicationName | Out-Host
+        & /usr/bin/tar -cJf $archiveFullPath $ApplicationName | Out-Host
     }
     if ($LASTEXITCODE -ne 0 -or -not (Test-Path -LiteralPath $archiveFullPath -PathType Leaf)) {
-        throw 'Portable ZIP creation failed'
+        throw 'Portable archive creation failed'
     }
 } finally {
     Pop-Location