QPM 2 PoC

.github/workflows/cargo-bleeding-release.yml

@@ -34,9 +34,9 @@ jobs:
           run-id: ${{ github.event.workflow_run.id }}
           path: artifacts
 
-      - name: Delete the previous bleeding release
+      - name: Delete the previous bleeding2 release
         run: |
-          gh release delete bleeding -y --cleanup-tag || true
+          gh release delete bleeding2 -y --cleanup-tag || true
         env:
           GH_TOKEN: ${{ github.token }}
 
@@ -51,6 +51,6 @@ jobs:
 
             SHA: ${{ github.sha }}
           name: 'Latest Build on main'
-          tag_name: bleeding
+          tag_name: bleeding2
           prerelease: true
           files: artifacts/**/*

.github/workflows/cargo-build.yml

@@ -40,7 +40,7 @@ jobs:
         shell: bash
         run: |
           # Get the last tag that isn't bleeding
-          LAST_TAG=$((git tag --merged HEAD --sort=-creatordate | grep -v '^bleeding$' | head -n 1) || true)
+          LAST_TAG=$((git tag --merged HEAD --sort=-creatordate | grep -v '^bleeding' | head -n 1) || true)
           echo "Last tag: $LAST_TAG"
 
           # Use version input or tag, fallback to default
@@ -76,29 +76,30 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            file-name: qpm
+
+            file-name: qpm2
             prefix: linux-x64
 
           - os: ubuntu-latest
-            file-name: qpm
+            file-name: qpm2
             prefix: linux-x64-static
             target: x86_64-unknown-linux-musl
 
           - os: macos-13
-            file-name: qpm
+            file-name: qpm2
             prefix: macos-x64
 
-          - os: macos-13
-            file-name: qpm
+          - os: macos-15
+            file-name: qpm2
             prefix: macos-arm64
             target: aarch64-apple-darwin
 
           - os: windows-latest
-            file-name: qpm.exe
+            file-name: qpm2.exe
             prefix: windows-x64
 
           - os: windows-latest
-            file-name: qpm.exe
+            file-name: qpm2.exe
             target: aarch64-pc-windows-msvc
             prefix: windows-arm64
 
@@ -187,7 +188,7 @@ jobs:
         if: matrix.prefix != ''
         uses: actions/upload-artifact@v4
         with:
-          name: ${{matrix.prefix}}-qpm
+          name: ${{matrix.prefix}}-qpm2
           path: target/${{ matrix.target }}/release/${{matrix.file-name}}
           if-no-files-found: error
 
@@ -210,36 +211,44 @@ jobs:
         uses: actions/upload-artifact@v4
         if: matrix.file-name != '' && matrix.os == 'windows-latest' && matrix.target != 'aarch64-pc-windows-msvc'
         with:
-          name: installer-${{ matrix.prefix }}
-          path: ./installer/qpm-installer.exe
+          name: release-installer-${{ matrix.prefix }}
+          path: ./installer/qpm2-installer.exe
           if-no-files-found: error
 
-  macos-universal:
-    name: Create macOS Universal Binary
-    runs-on: macos-13
-    needs: [build]
-    steps:
-      - name: Download Intel macOS build
-        uses: actions/download-artifact@v4
-        with:
-          name: macos-x64-qpm
-          path: macos-x64
-
-      - name: Download ARM macOS build
-        uses: actions/download-artifact@v4
-        with:
-          name: macos-arm64-qpm
-          path: macos-arm64
-
-      - name: Make Universal Binary
-        run: |
-          lipo -create -output "qpm" "macos-x64/qpm" "macos-arm64/qpm"
-          chmod +x qpm
-          zip -j "qpm-macos-universal.zip" "qpm"
+  # macos-universal:
+  #   name: Create macOS Universal Binary
+  #   runs-on: macos-13
+  #   needs: [build]
+  #   steps:
+  #     - name: Download Intel macOS build
+  #       uses: actions/download-artifact@v4
+  #       with:
+  #         name: macos-x64-qpm2
+  #         path: macos-x64
+
+  #     - name: Download ARM macOS build
+  #       uses: actions/download-artifact@v4
+  #       with:
+  #         name: macos-arm64-qpm2
+  #         path: macos-arm64
+
+  #     - name: Make Universal Binary
+  #       run: |
+  #         lipo -create -output "qpm2" "macos-x64/qpm2" "macos-arm64/qpm2"
+  #         chmod +x qpm2
+  #         zip -j "qpm2-macos-universal.zip" "qpm2"
+
+  #     - name: Artifact Upload (Archive)
+  #       uses: actions/upload-artifact@v4
+  #       with:
+  #         name: release-macos-universal
+  #         path: qpm2-macos-universal.zip
+  #         if-no-files-found: error
+
+  #     - name: Artifact Upload
+  #       uses: actions/upload-artifact@v4
+  #       with:
+  #         name: macos-universal-qpm2
+  #         path: qpm2
+  #         if-no-files-found: error
 
-      - name: Artifact Upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: macos-universal-qpm
-          path: qpm
-          if-no-files-found: error

.vscode/launch.json

@@ -6,14 +6,14 @@
       "request": "launch",
       "name": "Debug executable 'qpm_cli'",
       "cargo": {
-        "args": ["build", "--bin=qpm", "--package=qpm_cli"],
+        "args": ["build", "--bin=qpm2", "--package=qpm_cli"],
         "filter": {
-          "name": "qpm",
+          "name": "qpm2",
           "kind": "bin"
         }
       },
-      "args": ["download", "adb"],
-      "cwd": "${workspaceFolder}"
+      "args": ["restore","default"],
+      "cwd": "${workspaceFolder}/test_package"
     },
     {
       "type": "lldb",
@@ -22,7 +22,7 @@
       "cargo": {
         "args": ["test", "--no-run", "--bin=qpm", "--package=qpm_cli"],
         "filter": {
-          "name": "qpm",
+          "name": "qpm2",
           "kind": "bin"
         }
       },