Sort release assets (#80)

* Sort release assets

* Move winget/create-manifest.ps1 to service/create-winget-manifest.ps1

Author: mlocati

.github/workflows/build.yml

@@ -1009,23 +1009,34 @@ jobs:
     if: needs.versions.outputs.release-tag
     runs-on: ubuntu-latest
     steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v6
       -
         name: Create assets directory
-        run: mkdir -p assets
+        run: mkdir release-assets
       -
         name: Download assets
         uses: actions/download-artifact@v7
         with:
-          path: assets
+          path: release-assets
           pattern: assets-*
           merge-multiple: true
+      -
+        name: Build assets list
+        id: build-assets-list
+        run: |
+          printf 'assets<<EOF\n' >>"$GITHUB_OUTPUT"
+          ./service/list-assets.sh release-assets >>"$GITHUB_OUTPUT"
+          printf 'EOF\n' >>"$GITHUB_OUTPUT"
+          cat "$GITHUB_OUTPUT"
       -
         name: Publish release
         uses: softprops/action-gh-release@v2
         with:
           name: ${{ needs.versions.outputs.release-tag }}
           tag_name: ${{ needs.versions.outputs.release-tag }}
-          files: assets/*
+          files: ${{ steps.build-assets-list.outputs.assets }}
           fail_on_unmatched_files: true
           prerelease: ${{ needs.versions.outputs.is-prerelease == 'yes' && 'true' || 'false'  }}
           make_latest: ${{ needs.versions.outputs.is-prerelease == 'yes' && 'false' || 'true'  }}

.github/workflows/virustotal.yml

@@ -32,9 +32,18 @@ jobs:
           fi
           printf 'Using tag: %s\n' "$TAG_NAME"
           echo "tag-name=$TAG_NAME" >>"$GITHUB_OUTPUT"
+      -
+        name: Checkout
+        if: env.HAS_VT_API_KEY == 'true'
+        uses: actions/checkout@v6
+      -
+        name: Create assets directory
+        if: env.HAS_VT_API_KEY == 'true'
+        run: mkdir release-assets
       -
         name: Download release assets
         if: env.HAS_VT_API_KEY == 'true'
+        working-directory: release-assets
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
@@ -44,6 +53,15 @@ jobs:
           done
           echo 'Assets downloaded:'
           ls -l
+      -
+        name: Build assets list
+        if: env.HAS_VT_API_KEY == 'true'
+        id: build-assets-list
+        run: |
+          printf 'assets<<EOF\n' >>"$GITHUB_OUTPUT"
+          ./service/list-assets.sh release-assets >>"$GITHUB_OUTPUT"
+          printf 'EOF\n' >>"$GITHUB_OUTPUT"
+          cat "$GITHUB_OUTPUT"
       -
         name: Submit to VirusTotal
         if: env.HAS_VT_API_KEY == 'true'
@@ -53,9 +71,7 @@ jobs:
           vt_api_key: ${{ secrets.VIRUSTOTAL_API_KEY }}
           update_release_body: false
           request_rate: 4
-          files: |
-            *.exe
-            *.zip
+          files: ${{ steps.build-assets-list.outputs.assets }}
       -
         name: Update release body with VirusTotal report
         if: steps.submit.outputs.analysis

.github/workflows/winget.yml

@@ -106,7 +106,7 @@ jobs:
         run: |
           Import-Module -Name .\tmp\powershell-yaml\ -Force
           $releaseData = Get-Content -LiteralPath tmp/release.json | ConvertFrom-Json
-          $manifestPath, $packageVersion, $versionOperation = ./winget/create-manifest.ps1 ` -PackageIdentifier $env:WINGETPKGS_ID -ReleaseData $releaseData -ManifestsPath tmp/winget-pkgs/manifests
+          $manifestPath, $packageVersion, $versionOperation = ./service/create-winget-manifest.ps1 ` -PackageIdentifier $env:WINGETPKGS_ID -ReleaseData $releaseData -ManifestsPath tmp/winget-pkgs/manifests
           Write-Host "Manifest created at: $manifestPath"
           Get-ChildItem -LiteralPath $manifestPath -Recurse -File | ForEach-Object {
             Write-Host "::group::$($_.Name)"

winget/create-manifest.ps1 service/create-winget-manifest.ps1winget/create-manifest.ps1 renamed to service/create-winget-manifest.ps1

@@ -0,0 +1,77 @@
+#!/bin/bash
+#
+# Script that builds a sorted list of assets
+#
+# Arguments:
+# $1: Path to the directory containing the assets
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+if [ "$#" -ne 1 ] || [ -z "$1" ]; then
+    echo 'Please provide the path to the directory containing the assets as the first and only argument.'
+    exit 1
+fi
+dir="$1"
+if [ ! -d "$dir" ]; then
+    printf "The provided path '%s' is not a directory.\n" "$dir"
+    exit 1
+fi
+
+find "$dir" -type f -print0 | while IFS= read -r -d '' f; do
+    case "$f" in
+        *shared-32.exe)
+            p=01
+            ;;
+        *shared-32.zip)
+            p=02
+            ;;
+        *shared-64.exe)
+            p=03
+            ;;
+        *shared-64.zip)
+            p=04
+            ;;
+        *static-32.exe)
+            p=05
+            ;;
+        *static-32.zip)
+            p=06
+            ;;
+        *static-64.exe)
+            p=07
+            ;;
+        *static-64.zip)
+            p=08
+            ;;
+        *shared-32-dev-gcc.zip)
+            p=09
+            ;;
+        *shared-32-dev-msvc.zip)
+            p=10
+            ;;
+        *shared-64-dev-gcc.zip)
+            p=11
+            ;;
+        *shared-64-dev-msvc.zip)
+            p=12
+            ;;
+        *static-32-dev-gcc.zip)
+            p=13
+            ;;
+        *static-32-dev-msvc.zip)
+            p=14
+            ;;
+        *static-64-dev-gcc.zip)
+            p=15
+            ;;
+        *static-64-dev-msvc.zip)
+            p=16
+            ;;
+        *)
+            p=99
+            ;;
+    esac
+    printf "%s\t%s\n" "$p" "$(realpath -- "$f")"
+done | sort -k1,1n -k2 | cut -f2