Oops...needed to fix a dependency...

Author: Qard

.github/workflows/CI.yml

@@ -4,6 +4,7 @@ env:
   DEBUG: napi:*
   APP_NAME: python-node
   MACOSX_DEPLOYMENT_TARGET: '10.13'
+  CARGO_NET_GIT_FETCH_WITH_CLI: 'true'
 
 permissions:
   contents: write
@@ -23,6 +24,10 @@ on:
       - docs/**
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-ci
+  cancel-in-progress: true
+
 jobs:
   build:
     strategy:
@@ -90,6 +95,8 @@ jobs:
           run: |
             set -x
 
+            export CARGO_NET_GIT_FETCH_WITH_CLI=true
+
             # Install apt dependencies
             apt-get update -y
             apt-get install -y openssh-client
@@ -98,16 +105,41 @@ jobs:
             corepack disable
             npm i -gf pnpm
 
-            # Set up SSH key (to checkout private repos with cargo)
+            # Set up SSH keys (to checkout private repos with cargo)
             mkdir -p ~/.ssh
-            chmod -R 400 ~/.ssh
-            touch ~/.ssh/config  ~/.ssh/known_hosts
-            eval `ssh-agent -s`
-            echo "${{ secrets.HTTP_HANDLER_ACCESS_TOKEN }}" | tr -d '\r' | ssh-add -
-            echo "${{ secrets.HTTP_REWRITER_ACCESS_TOKEN }}" | tr -d '\r' | ssh-add -
-            ssh-add -l
+            chmod 700 ~/.ssh
+
+            # Save SSH keys to files with specific names
+            echo "${{ secrets.HTTP_HANDLER_ACCESS_TOKEN }}" | tr -d '\r' > ~/.ssh/id_rsa_http_handler
+            echo "${{ secrets.HTTP_REWRITER_ACCESS_TOKEN }}" | tr -d '\r' > ~/.ssh/id_rsa_http_rewriter
+            chmod 600 ~/.ssh/id_rsa_*
+
+            # Add GitHub to known hosts
             ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
 
+            # Create wrapper script for git to use correct SSH key based on repo
+            cat > ~/.ssh/git-ssh-wrapper.sh <<'EOF'
+            #!/bin/bash
+            if [[ "$@" == *"http-handler"* ]]; then
+                ssh -i ~/.ssh/id_rsa_http_handler -o StrictHostKeyChecking=no "$@"
+            elif [[ "$@" == *"http-rewriter"* ]]; then
+                ssh -i ~/.ssh/id_rsa_http_rewriter -o StrictHostKeyChecking=no "$@"
+            else
+                ssh -o StrictHostKeyChecking=no "$@"
+            fi
+            EOF
+            chmod +x ~/.ssh/git-ssh-wrapper.sh
+
+            # Export GIT_SSH to use our wrapper
+            export GIT_SSH=~/.ssh/git-ssh-wrapper.sh
+
+            # Test access to both repositories
+            echo "Testing access to repositories:"
+            echo "http-handler:"
+            GIT_SSH=~/.ssh/git-ssh-wrapper.sh git ls-remote ssh://git@github.com/platformatic/http-handler.git HEAD || echo "Failed to access http-handler"
+            echo "http-rewriter:"
+            GIT_SSH=~/.ssh/git-ssh-wrapper.sh git ls-remote ssh://git@github.com/platformatic/http-rewriter.git HEAD || echo "Failed to access http-rewriter"
+
             ${{ matrix.settings.build }}
       - name: Build
         run: ${{ matrix.settings.build }}
@@ -232,6 +264,8 @@ jobs:
           run: |
             set -x
 
+            export CARGO_NET_GIT_FETCH_WITH_CLI=true
+
             # Install apt dependencies
             apt-get update -y
             apt-get install -y openssh-client curl
@@ -240,16 +274,41 @@ jobs:
             curl https://sh.rustup.rs -sSf | bash -s -- -y -t ${{ matrix.settings.target }}
             source "$HOME/.cargo/env"
 
-            # Set up SSH key (to checkout private repos with cargo)
+            # Set up SSH keys (to checkout private repos with cargo)
             mkdir -p ~/.ssh
-            chmod -R 400 ~/.ssh
-            touch ~/.ssh/config  ~/.ssh/known_hosts
-            eval `ssh-agent -s`
-            echo "${{ secrets.HTTP_HANDLER_ACCESS_TOKEN }}" | tr -d '\r' | ssh-add -
-            echo "${{ secrets.HTTP_REWRITER_ACCESS_TOKEN }}" | tr -d '\r' | ssh-add -
-            ssh-add -l
+            chmod 700 ~/.ssh
+
+            # Save SSH keys to files with specific names
+            echo "${{ secrets.HTTP_HANDLER_ACCESS_TOKEN }}" | tr -d '\r' > ~/.ssh/id_rsa_http_handler
+            echo "${{ secrets.HTTP_REWRITER_ACCESS_TOKEN }}" | tr -d '\r' > ~/.ssh/id_rsa_http_rewriter
+            chmod 600 ~/.ssh/id_rsa_*
+
+            # Add GitHub to known hosts
             ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
 
+            # Create wrapper script for git to use correct SSH key based on repo
+            cat > ~/.ssh/git-ssh-wrapper.sh <<'EOF'
+            #!/bin/bash
+            if [[ "$@" == *"http-handler"* ]]; then
+                ssh -i ~/.ssh/id_rsa_http_handler -o StrictHostKeyChecking=no "$@"
+            elif [[ "$@" == *"http-rewriter"* ]]; then
+                ssh -i ~/.ssh/id_rsa_http_rewriter -o StrictHostKeyChecking=no "$@"
+            else
+                ssh -o StrictHostKeyChecking=no "$@"
+            fi
+            EOF
+            chmod +x ~/.ssh/git-ssh-wrapper.sh
+
+            # Export GIT_SSH to use our wrapper
+            export GIT_SSH=~/.ssh/git-ssh-wrapper.sh
+
+            # Test access to both repositories
+            echo "Testing access to repositories:"
+            echo "http-handler:"
+            GIT_SSH=~/.ssh/git-ssh-wrapper.sh git ls-remote ssh://git@github.com/platformatic/http-handler.git HEAD || echo "Failed to access http-handler"
+            echo "http-rewriter:"
+            GIT_SSH=~/.ssh/git-ssh-wrapper.sh git ls-remote ssh://git@github.com/platformatic/http-rewriter.git HEAD || echo "Failed to access http-rewriter"
+
             cargo test --target ${{ matrix.settings.target }}
       - name: Test bindings
         uses: addnab/docker-run-action@v3

.github/workflows/lint.yml

@@ -1,5 +1,8 @@
 name: Lint
 
+env:
+  CARGO_NET_GIT_FETCH_WITH_CLI: 'true'
+
 'on':
   push:
     branches:

Cargo.lock

@@ -20,10 +20,10 @@ crate-type = ["cdylib"]
 [dependencies]
 async-trait = "0.1.88"
 bytes = "1.10.1"
-http-handler = { git = "ssh://git@github.com/platformatic/http-handler" }
+http-handler = { git = "ssh://git@github.com/platformatic/http-handler.git" }
 # http-handler = { path = "../http-handler" }
-# http-rewriter = { git = "ssh://git@github.com/platformatic/http-rewriter" }
-http-rewriter = { path = "../http-rewriter" }
+http-rewriter = { git = "ssh://git@github.com/platformatic/http-rewriter.git" }
+# http-rewriter = { path = "../http-rewriter" }
 # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
 napi = { version = "3.0.0-beta.8", default-features = false, features = ["napi4"], optional = true }
 napi-derive = { version = "3.0.0-beta.8", optional = true }

Cargo.toml

@@ -0,0 +1,5 @@
+[toolchain]
+channel = "stable"
+components = [ "rustfmt", "rustc-dev", "clippy" ]
+targets = [ "aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu" ]
+profile = "minimal"