Merge branch 'main' of https://github.com/SKalt/cconvention

.github/workflows/release.yaml

@@ -558,8 +558,32 @@ jobs:
       - name: flatten directory
         shell: bash
         run: |
+          sudo apt install -y tree
+          tree ./artifacts
           mkdir flattened
-          find ./artifacts -type f -exec mv '{}' ./flattened/ ';'
+
+          # since all arch-specific builds of the cli are named cconvention,
+          # rename them when moving them into the directory to upload
+          variants=(base pro)
+          triples=(
+              x86_64-unknown-linux-gnu
+              aarch64-unknown-linux-gnu
+              x86_64-apple-darwin
+              aarch64-apple-darwin
+          )
+          for variant in "${variants[@]}"; do
+            for arch in "${triples[@]}"; do
+              name="cconvention-${variant}-${triple}"
+              cp ./artifacts/$name/cconvention ./flattened/$name
+            done
+          done
+          cp \
+            ./artifacts/x86_64-pc-windows-msvc/x86_64-pc-windows-msvc.exe \
+            ./flattened
+
+          # all vsix variants have unique names
+          cp ./artifacts/**/*.vsix ./flattened/
+
       - name: "checksums"
         if: steps.release_id.outputs.ok == 'true'
         shell: bash

scripts/build_vsix.sh

@@ -63,6 +63,7 @@ build_vsix() {
   mkdir -p "$dist_dir"
   log_dbug "copying orignial bin $original_bin_path -> $dist_dir/cconvention"
   cp "$original_bin_path" "$dist_dir/cconvention"
+  chmod +x "$dist_dir/cconvention" # ensure the binary is executable
   rm -f "$vsix_path" # just in case
   # see https://github.com/microsoft/vscode-vsce/issues/421 for issues with vsce+pnpm
   log_info "building $vsix_path"