Fix MacOS CI

QuestPackageManager · May 6, 2024 · a006e28 · a006e28
1 parent 7863690
commit a006e28
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/cargo-build.yml b/.github/workflows/cargo-build.yml
@@ -55,7 +55,7 @@ jobs:
           sudo apt-get install -y libdbus-1-dev
           
       - name: Get OpenSSL if MacOS
-        if: ${{ matrix.os == 'macos-latest' }}
+        if: ${{ matrix.os == 'macos-13' }}
         run: |
           brew install openssl@3
 
@@ -72,31 +72,31 @@ jobs:
           args: --release
 
       - uses: actions-rs/toolchain@v1
-        if: ${{matrix.os == 'macos-latest' }}
+        if: ${{matrix.os == 'macos-13' }}
         with:
           toolchain: nightly
           target: aarch64-apple-darwin
 
       - name: Double check
-        if: ${{ matrix.os == 'macos-latest' }}
+        if: ${{ matrix.os == 'macos-13' }}
         run: |
           rustup target add aarch64-apple-darwin 
           rustup show
 
       - name: Cargo build for aarch64 Mac
-        if: ${{matrix.os == 'macos-latest' }}
+        if: ${{matrix.os == 'macos-13' }}
         uses: actions-rs/cargo@v1
         with:
           command: build
           args: --release --target aarch64-apple-darwin
 
       - name: Make M1 Universal binary
-        if: ${{matrix.os == 'macos-latest' }}
+        if: ${{matrix.os == 'macos-13' }}
         run: lipo -create -output qpm-universal target/release/${{matrix.file-name}} target/aarch64-apple-darwin/release/${{matrix.file-name}}
 
       - name: Artifact Upload
         uses: actions/upload-artifact@v2
-        if: ${{matrix.os == 'macos-latest' }}
+        if: ${{matrix.os == 'macos-13' }}
         with:
           name: qpm-universal
           path: qpm-universal

diff --git a/.github/workflows/cargo-release.yml b/.github/workflows/cargo-release.yml
@@ -10,14 +10,14 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        os: [ubuntu-latest, windows-latest, macOS-13]
         include:
           - os: ubuntu-latest
             file-name: qpm
             prefix: linux-x64
             arch: x64
 
-          - os: macOS-latest
+          - os: macOS-13
             file-name: qpm
             prefix: macos-x64
             arch: x64
@@ -73,32 +73,32 @@ jobs:
             # MacOS Universal binaries
 
       - uses: actions-rs/toolchain@v1
-        if: ${{matrix.os == 'macos-latest' }}
+        if: ${{matrix.os == 'macos-13' }}
         with:
           toolchain: nightly
           target: aarch64-apple-darwin
 
       - name: Double check
-        if: ${{ matrix.os == 'macos-latest' }}
+        if: ${{ matrix.os == 'macos-13' }}
         run: |
           rustup target add aarch64-apple-darwin 
           rustup show
 
       - name: Cargo build for aarch64 Mac
-        if: ${{matrix.os == 'macos-latest' }}
+        if: ${{matrix.os == 'macos-13' }}
         uses: actions-rs/cargo@v1
         with:
           command: build
           args: --release --target aarch64-apple-darwin
 
       - name: Make M1 Universal binary
-        if: ${{matrix.os == 'macos-latest' }}
+        if: ${{matrix.os == 'macos-13' }}
         run: |
           lipo -create -output qpm target/release/${{matrix.file-name}} target/aarch64-apple-darwin/release/${{matrix.file-name}}
           pwsh -Command Compress-Archive qpm -DestinationPath qpm-macos-universal.zip 
 
       - name: Artifact Upload
-        if: ${{matrix.os == 'macos-latest' }}
+        if: ${{matrix.os == 'macos-13' }}
         uses: softprops/action-gh-release@v1
         with:
           files: qpm-macos-universal.zip

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -16,13 +16,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        os: [ubuntu-latest, windows-latest, macOS-13]
         include:
           - os: ubuntu-latest
             file-name: qpm
             prefix: linux
 
-          - os: macOS-latest
+          - os: macOS-13
             file-name: qpm
             prefix: macos
 

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,23 +6,23 @@
       "request": "launch",
       "name": "Debug executable 'qpm_cli'",
       "cargo": {
-        "args": ["build", "--bin=qpm_cli", "--package=qpm_cli"],
+        "args": ["build", "--bin=qpm", "--package=qpm_cli"],
         "filter": {
-          "name": "qpm_cli",
+          "name": "qpm",
           "kind": "bin"
         }
       },
-      "args": [],
+      "args": ["download", "adb"],
       "cwd": "${workspaceFolder}"
     },
     {
       "type": "lldb",
       "request": "launch",
       "name": "Debug unit tests in executable 'qpm_cli'",
       "cargo": {
-        "args": ["test", "--no-run", "--bin=qpm_cli", "--package=qpm_cli"],
+        "args": ["test", "--no-run", "--bin=qpm", "--package=qpm_cli"],
         "filter": {
-          "name": "qpm_cli",
+          "name": "qpm",
           "kind": "bin"
         }
       },