Artifact upload of vsix files without zipping (#1032)

* Artifact upload of vsix files without zipping
* Follow artifact naming convention vscode-cmsis-debugger-<os>-<arch>-<version>-<num_of_commits>-g<sha>

Author: soumeh01

.github/workflows/ci.yml

@@ -80,6 +80,8 @@ jobs:
             exit 1
           fi
           BASE_TAG=$(printf '%s\n' "${DESCRIBE}" | grep -Eo '^v[0-9]+\.[0-9]+\.[0-9]+')
+          # For non-release builds, increment the patch version by 1 (e.g. 1.64.1 -> 1.64.2)
+          NEXT_VERSION="$(printf '%s\n' "${BASE_TAG}" | awk -F. '{ printf "%d.%d.%d", $1, $2, $3 + 1 }')"
           PR_QUALIFIER=$(printf '%s\n' "${DESCRIBE}" | grep -Eo '\-g[0-9a-f]+$' || true)
           BRANCH_QUALIFIER=$(printf '%s\n' "${DESCRIBE}" | grep -Eo '[0-9]+\-g[0-9a-f]+$' || true)
           SAFE_REF_NAME="${{ github.ref_name }}"
@@ -91,13 +93,13 @@ jobs:
               npm version --allow-same-version --no-git-tag-version --new-version "${TAG#v}"
               ;;
             pull_request)
-              npm version -s --allow-same-version --no-git-tag-version --new-version "${BASE_TAG#v}"
-              PR_VERSION="${BASE_TAG#v}-pr${{ github.event.number }}${PR_QUALIFIER}"
+              npm version -s --allow-same-version --no-git-tag-version --new-version "${NEXT_VERSION}"
+              PR_VERSION="${NEXT_VERSION}-${BRANCH_QUALIFIER}"
               npm version --no-git-tag-version --new-version "${PR_VERSION}" && echo "Prerelease version set succeeded" || echo "Prerelease version set FAILED with exit code $?"
               ;;
             *)
-              npm version -s --allow-same-version --no-git-tag-version --new-version "${BASE_TAG#v}"
-              PR_VERSION="${BASE_TAG#v}-${SAFE_REF_NAME}${BRANCH_QUALIFIER}"
+              npm version -s --allow-same-version --no-git-tag-version --new-version "${NEXT_VERSION}"
+              PR_VERSION="${NEXT_VERSION}-${SAFE_REF_NAME}${BRANCH_QUALIFIER}"
               npm version --no-git-tag-version --new-version "${PR_VERSION}" && echo "Prerelease version set succeeded" || echo "Prerelease version set FAILED with exit code $?"
               ;;
           esac
@@ -224,8 +226,8 @@ jobs:
       - name: Upload package
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
-          name: vscode-cmsis-debugger-${{ matrix.target }}
-          path: ./*.vsix
+          path: ./*${{ matrix.target }}*.vsix
+          archive: false
           retention-days: 1
 
   validate:
@@ -273,7 +275,7 @@ jobs:
       - name: Download vsix package
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
-          pattern: vscode-cmsis-debugger-${{ matrix.target }}
+          pattern: vscode-cmsis-debugger-${{ matrix.target }}-*.vsix
 
       - name: Validate VSIX contents
         shell: bash
@@ -298,7 +300,7 @@ jobs:
       - name: Download packages
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
-          pattern: vscode-cmsis-debugger-*
+          pattern: vscode-cmsis-debugger-*.vsix
 
       - name: Download coverage report
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1

.github/workflows/nightly.yml

@@ -44,6 +44,8 @@ jobs:
           - platform: macos-14
             target: darwin
     runs-on: ${{ matrix.platform }}
+    outputs:
+      nightly_version: ${{ steps.set_version.outputs.nightly_version }}
     permissions:
       packages: read
     name: 'Build and test (${{ matrix.target }})'
@@ -69,18 +71,19 @@ jobs:
           package-manager-cache: false
 
       - name: Set version
+        id: set_version
         if: runner.os == 'Linux' && github.repository_owner == 'Open-CMSIS-Pack'
         run: |
           DESCRIBE=$(git describe --tags | grep -Eo 'v[0-9]+\.[0-9]+\.[0-9]+')
           QUALIFIER=$(git describe --tags | grep -Eo '[0-9]+\-g[0-9a-f]+$' || true)
-          BRANCH=$(echo "${{ github.ref_name }}" | sed 's/[^0-9A-Za-z-]/-/g')
           BASE="${DESCRIBE#v}"
           IFS='.' read -r MAJ MIN PAT <<< "$BASE"
-          PR_VERSION="${MAJ}.${MIN}.$((PAT + 1))-${BRANCH}${QUALIFIER:+-${QUALIFIER}}"
+          PR_VERSION="${MAJ}.${MIN}.$((PAT + 1))${QUALIFIER:+-${QUALIFIER}}"
           npm version --no-git-tag-version --new-version "${PR_VERSION}"
           VERSION="$(jq -r ".version" < package.json)"
           sed -i "s/## Unreleased/## ${VERSION}/" CHANGELOG.md
           echo "Version is ${VERSION}"
+          echo "nightly_version=${VERSION}" >> $GITHUB_OUTPUT
 
       - name: Remove badges
         if: runner.os == 'Linux'
@@ -143,6 +146,8 @@ jobs:
     name: Package
     runs-on: [ubuntu-latest]
     needs: build
+    env:
+      NIGHTLY_VERSION: ${{ needs.build.outputs.nightly_version }}
     strategy:
       fail-fast: true
       matrix:
@@ -189,13 +194,13 @@ jobs:
 
       - name: Create vsix package
         run: |
-          npm run package -- --target ${{ matrix.target }}
+          npm run package -- --target ${{ matrix.target }} --out "vscode-cmsis-debugger-nightly-${{ matrix.target }}-${NIGHTLY_VERSION}.vsix"
 
       - name: Upload package
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
-          name: vscode-cmsis-debugger-nightly-${{ matrix.target }}
-          path: ./*.vsix
+          path: ./*${{ matrix.target }}*.vsix
+          archive: false
           retention-days: 1
 
   validate:
@@ -243,7 +248,7 @@ jobs:
       - name: Download vsix package
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
-          pattern: vscode-cmsis-debugger-nightly-${{ matrix.target }}
+          pattern: vscode-cmsis-debugger-nightly-${{ matrix.target }}-*.vsix
 
       - name: Validate VSIX contents
         shell: bash