ci: single-job sequential per-platform artifact upload using @actions/artifact (no nested zips or matrix)

Author: sunflower2333

.github/workflows/build-and-upload-aml.yml

@@ -6,88 +6,96 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
-    name: Configure, build and prepare artifacts
-    runs-on: ubuntu-latest
-    outputs:
-      platforms: ${{ steps.prepare.outputs.platforms }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+    build:
+      name: Configure, build and upload per-platform artifacts
+      runs-on: ubuntu-latest
+      outputs:
+        platforms: ${{ steps.prepare.outputs.platforms }}
+      steps:
+        - name: Checkout repository
+          uses: actions/checkout@v4
 
-      - name: Install build dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y build-essential cmake ninja-build zip python3 python3-pip jq
+        - name: Install build dependencies
+          run: |
+            sudo apt-get update
+            sudo apt-get install -y build-essential cmake ninja-build zip python3 python3-pip jq nodejs npm unzip
 
-      - name: Configure CMake
-        run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
+        - name: Configure CMake
+          run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
 
-      - name: Build
-        run: cmake --build build -- -j$(nproc)
+        - name: Build
+          run: cmake --build build -- -j$(nproc)
 
-      - name: Collect AMLs and create per-platform zips
-        id: prepare
-        run: |
-          set -euo pipefail
-          mkdir -p artifacts
-          platforms=()
+        - name: Collect AMLs into per-platform directories
+          id: prepare
+          run: |
+            set -euo pipefail
+            mkdir -p artifacts
+            platforms=()
 
-          for dir in build/*/builtin; do
-            if [ -d "$dir" ]; then
-              shopt -s nullglob
-              aml_files=("$dir"/*.aml)
-              if [ ${#aml_files[@]} -gt 0 ]; then
-                platform=$(basename "$(dirname "$dir")")
-                echo "Packaging $platform..."
-                zip -j "artifacts/${platform}.zip" "$dir"/*.aml || true
-                platforms+=("$platform")
+            for dir in build/*/builtin; do
+              if [ -d "$dir" ]; then
+                shopt -s nullglob
+                aml_files=("$dir"/*.aml)
+                if [ ${#aml_files[@]} -gt 0 ]; then
+                  platform=$(basename "$(dirname "$dir")")
+                  echo "Packaging $platform into directory..."
+                  mkdir -p "artifacts/${platform}"
+                  cp -f "$dir"/*.aml "artifacts/${platform}/" || true
+                  platforms+=("$platform")
+                fi
+                shopt -u nullglob
               fi
-              shopt -u nullglob
+            done
+
+            # Convert platforms array to JSON using jq
+            if [ ${#platforms[@]} -gt 0 ]; then
+              PLATFORMS_JSON=$(printf '%s\n' "${platforms[@]}" | jq -R -s -c 'split("\n")[:-1]')
+            else
+              PLATFORMS_JSON='[]'
             fi
-          done
 
-          # Convert platforms array to JSON using jq
-          if [ ${#platforms[@]} -gt 0 ]; then
-            PLATFORMS_JSON=$(printf '%s\n' "${platforms[@]}" | jq -R -s -c 'split("\n")[:-1]')
-          else
-            PLATFORMS_JSON='[]'
-          fi
+            echo "Found platforms: $PLATFORMS_JSON"
+            echo "platforms=$PLATFORMS_JSON" >> $GITHUB_OUTPUT
+
+        - name: Prepare Node uploader
+          run: |
+            npm init -y
+            npm install @actions/[email protected]
 
-          echo "Found platforms: $PLATFORMS_JSON"
-          echo "platforms=$PLATFORMS_JSON" >> $GITHUB_OUTPUT
+        - name: Write uploader script
+          run: |
+            cat > upload_artifacts.js <<'JS'
+const fs = require('fs');
+const path = require('path');
+const artifact = require('@actions/artifact');
 
-      - name: Upload all platform zips as a single artifact
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: aml-zips
-          path: artifacts/*.zip
-  upload:
-    name: Upload platform artifacts
-    needs: build
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: ${{ fromJson(needs.build.outputs.platforms) }}
-    steps:
-      - name: Download zips artifact from build job
-        uses: actions/download-artifact@v4
-        with:
-          name: aml-zips
-          path: downloaded_artifacts
+async function main() {
+  const client = artifact.create();
+  const platforms = JSON.parse(process.env.PLATFORMS_JSON || '[]');
+  if (!platforms.length) {
+    console.log('No platforms to upload');
+    return;
+  }
+  for (const p of platforms) {
+    const dir = path.join('artifacts', p);
+    if (!fs.existsSync(dir)) {
+      console.log(`Skipping ${p}, directory not found: ${dir}`);
+      continue;
+    }
+    const files = fs.readdirSync(dir).map(f => path.join(dir, f));
+    console.log(`Uploading artifact ${p} with files:`, files);
+    // uploadArtifact(name, files, rootDirectory)
+    await client.uploadArtifact(p, files, dir);
+  }
+}
 
-      - name: Ensure platform zip exists
-        run: |
-          ls -al downloaded_artifacts || true
-          if [ ! -f "downloaded_artifacts/${{ matrix.platform }}.zip" ]; then
-            echo "Platform zip not found: downloaded_artifacts/${{ matrix.platform }}.zip"
-            false
-          fi
+main().catch(err => { console.error(err); process.exit(1); });
+JS
 
-      - name: Upload artifact for platform
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.platform }}
-          path: downloaded_artifacts/${{ matrix.platform }}.zip
+        - name: Upload per-platform artifacts (single job, sequential)
+          env:
+            PLATFORMS_JSON: ${{ steps.prepare.outputs.platforms }}
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          run: |
+            node upload_artifacts.js