From 603e35e66e5779079bc74c30e4175a661451bfc3 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Wed, 16 Apr 2025 10:40:02 -0400 Subject: [PATCH] convert artifact/package building to use the .tar.gz mechanism of the CMake build instead of packing a .zip with loose files (perhaps if we want both we add a separate artifact for that later?); --- .github/workflows/build.yml | 15 +++++++-------- .github/workflows/release.yml | 13 +++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 04510c57..26a0acdd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ on: build_type: description: "CMake Build Type" required: true - default: "Release" + default: "RelWithDebInfo" type: choice options: - Release @@ -91,16 +91,15 @@ jobs: fi make -j $(nproc) + make tarball - name: Package run: | - mkdir -p ${{ env.PACKAGENAME }} - cp dvmcmd dvmhost dvmfne ${{ env.PACKAGENAME }} - zip -9 -r ${{ env.PACKAGENAME }}.zip ${{ env.PACKAGENAME }} + mv dvmhost_*.tar.gz ${{ env.PACKAGENAME }}.tar.gz - name: Upload artifact uses: actions/upload-artifact@v4 with: name: ${{ needs.setup.outputs.APPNAME }}-${{ matrix.arch }} - path: ${{ env.PACKAGENAME }}.zip + path: ${{ env.PACKAGENAME }}.tar.gz create-release: if: ${{ github.event.inputs.create_pre_release == 'true' }} @@ -141,6 +140,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.create-release.outputs.upload_url }} - asset_path: ${{ env.PACKAGENAME }}.zip - asset_name: ${{ env.PACKAGENAME }}.zip - asset_content_type: application/zip + asset_path: ${{ env.PACKAGENAME }}.tar.gz + asset_name: ${{ env.PACKAGENAME }}.tar.gz + asset_content_type: application/gzip diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 792dec46..4f0f514c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,16 +62,17 @@ jobs: fi make -j $(nproc) + make strip + make tarball - name: Package run: | + mv dvmhost_*.tar.gz ${{ env.PACKAGENAME }}.tar.gz mkdir -p ${{ env.PACKAGENAME }} - cp dvmcmd dvmhost ${{ env.PACKAGENAME }} - zip -9 -r ${{ env.PACKAGENAME }}.zip ${{ env.PACKAGENAME }} - name: Upload artifact uses: actions/upload-artifact@v4 with: name: ${{ needs.setup.outputs.APPNAME }}-${{ matrix.arch }} - path: ${{ env.PACKAGENAME }}.zip + path: ${{ env.PACKAGENAME }}.tar.gz create-release: name: Create Release @@ -110,6 +111,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.create-release.outputs.upload_url }} - asset_path: ${{ env.PACKAGENAME }}.zip - asset_name: ${{ env.PACKAGENAME }}.zip - asset_content_type: application/zip + asset_path: ${{ env.PACKAGENAME }}.tar.gz + asset_name: ${{ env.PACKAGENAME }}.tar.gz + asset_content_type: application/gzip