Merge branch 'main' into constants

Author: deepfuriya

.github/workflows/alpha-release.yml

@@ -21,6 +21,7 @@ jobs:
         with:
           ref: ${{ inputs.ref || 'main' }}
           fetch-depth: 0
+          fetch-tags: true
 
       - name: Configure Git
         run: |

.github/workflows/beta-release.yml

@@ -5,11 +5,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  get-configs:
-    uses: ./.github/workflows/configs.yml
-
-  promote-main-to-beta:
-    needs: [get-configs]
+  create-beta-tag:
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -22,18 +18,12 @@ jobs:
           fetch-depth: 0
           fetch-tags: true
 
-      - name: Setup Node.js ${{ needs.get-configs.outputs.node-version }}
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ needs.get-configs.outputs.node-version }}
-          cache: 'npm'
-
       - name: Configure Git
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
 
-      - name: Bump Version and Tag
+      - name: Tag
         id: version-and-tag
         run: |
           PKG_VERSION=$(jq -r .version package.json)
@@ -46,9 +36,9 @@ jobs:
           echo "tag=$FULL_TAG" >> $GITHUB_OUTPUT
 
   call-release:
-    needs: [promote-main-to-beta]
+    needs: [create-beta-tag]
     uses: ./.github/workflows/release.yml
     permissions:
       contents: write
     with:
-      tag: ${{ needs.promote-main-to-beta.outputs.tag }}
+      tag: ${{ needs.create-beta-tag.outputs.tag }}

.github/workflows/configs.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       NODE_VERSION: '22.x'
-      GO_VERSION: '1.25.x'
+      GO_VERSION: '1.25.4'
     outputs:
       node-version: ${{ env.NODE_VERSION }}
       go-version: ${{ env.GO_VERSION }}

.github/workflows/release.yml

@@ -31,13 +31,13 @@ jobs:
         with:
           ref: ${{ inputs.tag }}
           fetch-tags: true
-      
+
       - name: Get version from package.json
         id: get-version
         run: |
           VERSION=$(node -p "require('./package.json').version")
           echo "version=$VERSION" >> $GITHUB_OUTPUT
-      
+
       - name: Validate tag matches version
         id: validate-tag
         run: |
@@ -59,33 +59,112 @@ jobs:
           fi
 
   build-and-test:
-    needs: [get-configs, version-and-tag]
+    needs: [ get-configs, version-and-tag ]
     uses: ./.github/workflows/build-and-test.yml
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ ubuntu-22.04, windows-latest, macos-latest ]
     with:
       ref: ${{ needs.version-and-tag.outputs.tag }}
       runs-on: ${{ matrix.os }}
 
-  bundle-and-release:
-    needs: [get-configs, version-and-tag, build-and-test]
-    permissions:
-      contents: write
+  bundle-linux:
+    needs: [ get-configs, version-and-tag, build-and-test ]
     strategy:
       fail-fast: true
       matrix:
         include:
-          - { os: "ubuntu-latest", arch: "x64", platform: "linux", go-arch: "amd64" }
-          - { os: "ubuntu-latest", arch: "arm64", platform: "linux", go-arch: "arm64" }
-          - { os: "ubuntu-latest", arch: "arm", platform: "linux", go-arch: "arm" }
-          - { os: "ubuntu-22.04", arch: "x64", platform: "linux", go-arch: "amd64" }
-          - { os: "ubuntu-22.04", arch: "arm64", platform: "linux", go-arch: "arm64" }
-          - { os: "ubuntu-22.04", arch: "arm", platform: "linux", go-arch: "arm" }
-          - { os: "macos-latest", arch: "x64", platform: "darwin", go-arch: "amd64" }
-          - { os: "macos-latest", arch: "arm64", platform: "darwin", go-arch: "arm64" }
-          - { os: "windows-latest", arch: "x64", platform: "win32", go-arch: "amd64" }
+          - { arch: "x64", docker-platform: "linux/amd64", go-arch: "amd64", use_qemu: false, node-version: "22" }
+          - { arch: "arm64", docker-platform: "linux/arm64", go-arch: "arm64", use_qemu: true, node-version: "22" }
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          ref: ${{ needs.version-and-tag.outputs.tag }}
+          fetch-tags: true
+
+      - name: Set release asset name
+        id: set-asset-name
+        shell: bash
+        run: |
+          APP_NAME=${{ needs.get-configs.outputs.app-name }}
+          VERSION=$(node -p "require('./package.json').version")
+          NODE_VERSION=${{ matrix.node-version }}
+          NODE_MAJOR=$(echo $NODE_VERSION | cut -d. -f1)
+          
+          TAG=${{ needs.version-and-tag.outputs.tag }}
+          if [[ "$TAG" =~ -alpha$ ]]; then
+            FILE_NAME="${APP_NAME}-${VERSION}-alpha-linux-${{ matrix.arch }}-node${NODE_MAJOR}"
+          elif [[ "$TAG" =~ -beta$ ]]; then
+            FILE_NAME="${APP_NAME}-${VERSION}-beta-linux-${{ matrix.arch }}-node${NODE_MAJOR}"
+          else
+            FILE_NAME="${APP_NAME}-${VERSION}-linux-${{ matrix.arch }}-node${NODE_MAJOR}"
+          fi
+          
+          ASSET_NAME=$(echo "$FILE_NAME" | tr '[:upper:]' '[:lower:]')
+          echo "ASSET_NAME=${ASSET_NAME}" >> $GITHUB_OUTPUT
+
+      - name: Set up QEMU
+        if: matrix.use_qemu
+        uses: docker/setup-qemu-action@v3
+
+      - name: Bundle (${{ matrix.docker-platform }}
+        run: |
+          docker run --rm -v ${{ github.workspace }}:/work -w /work \
+            --platform ${{ matrix.docker-platform }} \
+            amazonlinux:2023 \
+            /bin/bash -c '
+              set -ex
+              yum install -y make gcc-c++ python3 tar gzip wget tree
+          
+              wget -q https://go.dev/dl/go${{ needs.get-configs.outputs.go-version }}.linux-${{ matrix.go-arch }}.tar.gz
+              tar -C /usr/local -xzf go${{ needs.get-configs.outputs.go-version }}.linux-${{ matrix.go-arch }}.tar.gz
+              export PATH=$PATH:/usr/local/go/bin
+          
+              curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
+              export NVM_DIR="$HOME/.nvm"
+              . "$NVM_DIR/nvm.sh"
+              nvm install ${{ matrix.node-version }}
+              nvm use ${{ matrix.node-version }}
+          
+              npm ci
+
+              TAG="${{ needs.version-and-tag.outputs.tag }}"
+              if [[ "$TAG" =~ -alpha$ ]]; then
+                npm run bundle:alpha
+              elif [[ "$TAG" =~ -beta$ ]]; then
+                npm run bundle:beta
+              else
+                npm run bundle:prod
+              fi
+          
+              tree -f bundle/production/node_modules/tree-sitter
+              tree -f bundle/production/node_modules/tree-sitter-json
+          
+              GOARCH=${{ matrix.go-arch }} go build -C ./cfn-init/cmd -v -o ../../bundle/production/bin/cfn-init
+              cp ./cfn-init/THIRD-PARTY-LICENSES.txt ./bundle/production/bin/
+            '
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.set-asset-name.outputs.ASSET_NAME }}
+          path: bundle/production/
+          if-no-files-found: error
+          include-hidden-files: true
+          compression-level: 6
+
+  bundle-win-mac:
+    needs: [ get-configs, version-and-tag, build-and-test ]
+    strategy:
+      fail-fast: true
+      matrix:
+        include:
+          - { os: "macos-latest", arch: "x64", platform: "darwin", go-arch: "amd64", node-version: "22.x" }
+          - { os: "macos-latest", arch: "arm64", platform: "darwin", go-arch: "arm64", node-version: "22.x" }
+          - { os: "windows-latest", arch: "x64", platform: "win32", go-arch: "amd64", node-version: "22.x" }
+          - { os: "windows-11-arm", arch: "arm64", platform: "win32", go-arch: "arm64", node-version: "22.x" }
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v5
@@ -97,10 +176,10 @@ jobs:
         shell: bash
         run: echo "Bundling from branch=$(git rev-parse --abbrev-ref HEAD), commit=$(git rev-parse HEAD), tag=$(git describe --tags --exact-match)"
 
-      - name: Setup Node.js ${{ needs.get-configs.outputs.node-version }} (${{ runner.os }})
+      - name: Setup Node.js ${{ matrix.node-version }} (${{ runner.os }})
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ needs.get-configs.outputs.node-version }}
+          node-version: ${{ matrix.node-version }}
           cache: 'npm'
 
       - name: Setup Go ${{ needs.get-configs.outputs.go-version }} (${{ runner.os }})
@@ -117,11 +196,11 @@ jobs:
         run: |
           TAG=${{ needs.version-and-tag.outputs.tag }}
           if [[ "$TAG" =~ -alpha$ ]]; then
-            npm run bundle:alpha -- --env platform=${{ matrix.platform }} --env arch=${{ matrix.arch }}
+            npm run bundle:alpha
           elif [[ "$TAG" =~ -beta$ ]]; then
-            npm run bundle:beta -- --env platform=${{ matrix.platform }} --env arch=${{ matrix.arch }}
+            npm run bundle:beta
           else
-            npm run bundle:prod -- --env platform=${{ matrix.platform }} --env arch=${{ matrix.arch }}
+            npm run bundle:prod
           fi
 
       - name: Bundle Go
@@ -144,47 +223,61 @@ jobs:
           VERSION=$(node -p "require('./package.json').version")
           PLATFORM=${{ matrix.platform }}
           ARCH=${{ matrix.arch }}
-          
-          if [[ "${{ matrix.os }}" == "ubuntu-22.04" ]]; then
-            PLATFORM="linux22"
-          fi
+          NODE_VERSION=${{ matrix.node-version }}
+          NODE_MAJOR=$(echo $NODE_VERSION | cut -d. -f1)
           
           TAG=${{ needs.version-and-tag.outputs.tag }}
           if [[ "$TAG" =~ -alpha$ ]]; then
-            FILE_NAME="${APP_NAME}-${VERSION}-alpha-${PLATFORM}-${ARCH}.zip"
+            FILE_NAME="${APP_NAME}-${VERSION}-alpha-${PLATFORM}-${ARCH}-node${NODE_MAJOR}"
           elif [[ "$TAG" =~ -beta$ ]]; then
-            FILE_NAME="${APP_NAME}-${VERSION}-beta-${PLATFORM}-${ARCH}.zip"
+            FILE_NAME="${APP_NAME}-${VERSION}-beta-${PLATFORM}-${ARCH}-node${NODE_MAJOR}"
           else
-            FILE_NAME="${APP_NAME}-${VERSION}-${PLATFORM}-${ARCH}.zip"
+            FILE_NAME="${APP_NAME}-${VERSION}-${PLATFORM}-${ARCH}-node${NODE_MAJOR}"
           fi
           
           ASSET_NAME=$(echo "$FILE_NAME" | tr '[:upper:]' '[:lower:]')
           echo "ASSET_NAME=${ASSET_NAME}"
           echo "ASSET_NAME=${ASSET_NAME}" >> $GITHUB_OUTPUT
 
-      - name: Create Zip (Unix)
-        if: runner.os != 'Windows'
-        env:
-          ASSET_NAME: ${{ steps.set-asset-name.outputs.ASSET_NAME }}
-        run: |
-          echo "Creating zip: ${{ env.ASSET_NAME }}"
-          (cd ./bundle/production && zip -r ../../${{ env.ASSET_NAME }} .)
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.set-asset-name.outputs.ASSET_NAME }}
+          path: bundle/production/
+          if-no-files-found: error
+          include-hidden-files: true
+          compression-level: 6
 
-      - name: Create Zip (Windows)
-        if: runner.os == 'Windows'
-        env:
-          ASSET_NAME: ${{ steps.set-asset-name.outputs.ASSET_NAME }}
+  release:
+    needs: [ version-and-tag, bundle-linux, bundle-win-mac ]
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Download all artifacts
+        uses: actions/download-artifact@v5
+        with:
+          path: artifacts
+          extract: false
+
+      - name: Create zip files for release
         run: |
-          echo "Creating zip: ${{ env.ASSET_NAME }}"
-          Compress-Archive -Path ./bundle/production/* -DestinationPath ./${{ env.ASSET_NAME }}
+          ls -R artifacts/
+          
+          cd artifacts
+          for dir in */; do
+            dirname="${dir%/}"
+            echo "Creating ${dirname}.zip"
+            (cd "$dirname" && zip -r "../${dirname}.zip" .)
+            rm -rf "$dirname"
+          done
+          ls -lh *.zip
 
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v2
-        env:
-          ASSET_NAME: ${{ steps.set-asset-name.outputs.ASSET_NAME }}
         with:
           tag_name: ${{ needs.version-and-tag.outputs.tag }}
           prerelease: ${{ needs.version-and-tag.outputs.is-prerelease }}
-          files: ${{ env.ASSET_NAME }}
+          files: artifacts/*.zip
           generate_release_notes: true
           fail_on_unmatched_files: true