ci: fix minor workflow bugs

Author: yhseanhsu

.github/workflows/ci-release.yml

@@ -2,74 +2,57 @@ name: Core CI & Release
 
 on:
   push:
-    branches:
-      - main
-    tags:
-      - 'v*'
+    branches: [main]
+    tags: ['v*']
   pull_request:
-    branches:
-      - main
+    branches: [main]
 
 jobs:
-  # --- STAGE 0: Version Verification (Tags Only) ---
   verify-version:
     name: Verify Version Match
     if: startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Compare Tag to VERSION file
-        run: |
+      - uses: actions/checkout@v4
+      - run: |
           TAG_VERSION=${GITHUB_REF_NAME#v}
           FILE_VERSION=$(cat VERSION)
           if [[ "$TAG_VERSION" != "$FILE_VERSION"* ]]; then
-            echo "::error::Version Mismatch! Tag '$TAG_VERSION' must start with '$FILE_VERSION'"
+            echo "::error::Version Mismatch! Tag '$TAG_VERSION' vs VERSION '$FILE_VERSION'"
             exit 1
           fi
 
-  # --- STAGE 1: Build WASM Core ---
   build-core:
     name: Build WASM Core
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Cache Emscripten SDK
+      - uses: actions/checkout@v4
+      - name: Cache Emscripten
         id: cache-emsdk
         uses: actions/cache@v4
         with:
           path: emsdk
           key: ${{ runner.os }}-emsdk-4.0.10
-
-      - name: Install Emscripten (if not cached)
+      - name: Install Emscripten
         if: steps.cache-emsdk.outputs.cache-hit != 'true'
         run: |
           git clone https://github.com/emscripten-core/emsdk.git
           cd emsdk && ./emsdk install 4.0.10 && ./emsdk activate 4.0.10
-
-      - name: Compile WASM
+      - name: Compile
         run: |
           source emsdk/emsdk_env.sh
           make wasm
-
-      - name: Upload Python WASM Artifacts
+      - name: Upload Python Artifacts
         uses: actions/upload-artifact@v4
         with:
           name: python-wasm-binaries  
           path: j2735codec/bindings/python/src/j2735codec/generated/
-          retention-days: 1
-      
-      - name: Upload Node WASM Artifacts
+      - name: Upload Node Artifacts
         uses: actions/upload-artifact@v4
         with:
           name: node-wasm-binaries  
           path: j2735codec/bindings/node/src/generated/
-          retention-days: 1
 
-  # --- STAGE 2: Test Bindings ---
   test-bindings:
     name: Test ${{ matrix.binding }}
     needs: build-core
@@ -78,50 +61,20 @@ jobs:
       fail-fast: false
       matrix:
         binding: [python, node]
-    
     steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         with:
           name: ${{ matrix.binding }}-wasm-binaries
           path: j2735codec/bindings/${{ matrix.binding }}/${{ matrix.binding == 'python' && 'src/j2735codec/generated/' || 'src/generated/' }}
-
-      # Python Tests
-      - name: Setup uv
-        if: matrix.binding == 'python'
-        uses: astral-sh/setup-uv@v5
-        with:
-          enable-cache: true
-
-      - name: Python Test Suite
-        if: matrix.binding == 'python'
+      - name: Setup & Test
         run: |
-          cd j2735codec/bindings/python
-          uv sync
-          uv run pytest tests/ -s
-        env:
-          PYTHONPATH: src
-
-      # Node.js Tests
-      - name: Setup Node.js
-        if: matrix.binding == 'node'
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: 'j2735codec/bindings/node/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: 'package-lock.json'
-
-      - name: Node Test Suite
-        if: matrix.binding == 'node'
-        run: |
-          npm install
-          npm run build -w j2735codec
-          npm test -w j2735codec
+          if [ "${{ matrix.binding }}" == "python" ]; then
+            pip install uv && cd j2735codec/bindings/python && uv sync && uv run pytest
+          else
+            npm install && npm run build -w j2735codec && npm test -w j2735codec
+          fi
 
-  # --- STAGE 3: Unified Release (Tags Only) ---
   publish-release:
     name: Publish Release
     needs: [verify-version, test-bindings]
@@ -130,50 +83,63 @@ jobs:
     permissions:
       contents: write
     steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-    
+      - uses: actions/checkout@v4
+      
       - name: Download Artifacts
         uses: actions/download-artifact@v4
         with:
           path: artifacts
 
-      - name: Build Python Release
+      - name: Build & Stage Assets
         run: |
-          mkdir -p j2735codec/bindings/python/src/j2735codec/generated/
-          cp -R artifacts/python-wasm-binaries/* j2735codec/bindings/python/src/j2735codec/generated/
-          cp LICENSE NOTICE j2735codec/bindings/python/
+          # 1. Create a clean staging area at the ROOT
+          STAGING="$GITHUB_WORKSPACE/dist_release"
+          mkdir -p $STAGING
+          
+          # 2. Build Python
+          PY_DIR="$GITHUB_WORKSPACE/j2735codec/bindings/python"
+          mkdir -p $PY_DIR/src/j2735codec/generated/
+          cp -R artifacts/python-wasm-binaries/* $PY_DIR/src/j2735codec/generated/
           pip install uv
-          cd j2735codec/bindings/python && uv build
-
-      - name: Build Node Release
-        run: |
-          mkdir -p j2735codec/bindings/node/src/generated/
-          cp -R artifacts/node-wasm-binaries/* j2735codec/bindings/node/src/generated/
-          cp LICENSE NOTICE j2735codec/bindings/node/
-          # Build and Pack
+          cd $PY_DIR && uv build --out-dir ./dist_local
+          
+          # Use find to move and prefix files safely
+          find ./dist_local -type f -exec bash -c 'cp "$1" "'$STAGING'/python-$(basename "$1")"' _ {} \;
+
+          # 3. Build Node
+          cd $GITHUB_WORKSPACE
+          JS_DIR="$GITHUB_WORKSPACE/j2735codec/bindings/node"
+          mkdir -p $JS_DIR/src/generated/
+          cp -R artifacts/node-wasm-binaries/* $JS_DIR/src/generated/
           npm install
           npm run build -w j2735codec
-          cd j2735codec/bindings/node && npm pack
+          cd $JS_DIR && npm pack
+          
+          # Move and prefix node tarball
+          find . -maxdepth 1 -name "*.tgz" -exec bash -c 'cp "$1" "'$STAGING'/node-$(basename "$1")"' _ {} \;
+
+          # 4. Grab Raw WASM Binary
+          cp $GITHUB_WORKSPACE/artifacts/python-wasm-binaries/j2735codec.wasm $STAGING/j2735codec.wasm
+
+          # 5. Legal
+          cp $GITHUB_WORKSPACE/LICENSE $STAGING/
+          cp $GITHUB_WORKSPACE/NOTICE $STAGING/
+
+      - name: Verify Staging Contents
+        run: |
+          echo "Listing files to be uploaded:"
+          ls -lh dist_release/
+          if [ $(ls dist_release/ | wc -l) -eq 0 ]; then echo "EMPTY STAGING FOLDER" && exit 1; fi
 
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v2
         with:
           name: "Release ${{ github.ref_name }}"
           body: |
             ## J2735 Codec Release ${{ github.ref_name }}
-            
-            ### Included Artifacts
-            - Python Wheel and Source Dist
-            - Node.js Tarball
-            
-            ---
-            *Licensed under Apache-2.0. See LICENSE and NOTICE files in packages.*
+            - **python-***: Python Wheel & Source Dist
+            - **node-***: Node.js Tarball
+            - **j2735codec.wasm**: Standalone WASM engine
           prerelease: ${{ contains(github.ref_name, 'test') || contains(github.ref_name, 'alpha') || contains(github.ref_name, 'beta') }}
-          files: |
-            j2735codec/bindings/python/dist/*.whl
-            j2735codec/bindings/python/dist/*.tar.gz
-            j2735codec/bindings/node/*.tgz
-            LICENSE
-            NOTICE
+          files: dist_release/*
           generate_release_notes: true

j2735codec/bindings/node/.nvmrc

@@ -0,0 +1 @@
+v22.16.0