Skip to content

Commit 50cdf9a

Browse files
committed
Oops...needed to fix a dependency...
1 parent 8d433d5 commit 50cdf9a

File tree

5 files changed

+63
-28
lines changed

5 files changed

+63
-28
lines changed

.github/workflows/CI.yml

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ env:
44
DEBUG: napi:*
55
APP_NAME: python-node
66
MACOSX_DEPLOYMENT_TARGET: '10.13'
7+
CARGO_NET_GIT_FETCH_WITH_CLI: 'true'
78

89
permissions:
910
contents: write
@@ -23,6 +24,10 @@ on:
2324
- docs/**
2425
pull_request:
2526

27+
concurrency:
28+
group: ${{ github.workflow }}-${{ github.ref }}-ci
29+
cancel-in-progress: true
30+
2631
jobs:
2732
build:
2833
strategy:
@@ -90,6 +95,8 @@ jobs:
9095
run: |
9196
set -x
9297
98+
export CARGO_NET_GIT_FETCH_WITH_CLI=true
99+
93100
# Install apt dependencies
94101
apt-get update -y
95102
apt-get install -y openssh-client
@@ -98,14 +105,16 @@ jobs:
98105
corepack disable
99106
npm i -gf pnpm
100107
101-
# Set up SSH key (to checkout private repos with cargo)
108+
# Set up SSH keys (to checkout private repos with cargo)
102109
mkdir -p ~/.ssh
103-
chmod -R 400 ~/.ssh
104-
touch ~/.ssh/config ~/.ssh/known_hosts
105-
eval `ssh-agent -s`
106-
echo "${{ secrets.HTTP_HANDLER_ACCESS_TOKEN }}" | tr -d '\r' | ssh-add -
107-
echo "${{ secrets.HTTP_REWRITER_ACCESS_TOKEN }}" | tr -d '\r' | ssh-add -
108-
ssh-add -l
110+
chmod 700 ~/.ssh
111+
112+
# Save SSH keys to files with specific names
113+
echo "${{ secrets.HTTP_HANDLER_ACCESS_TOKEN }}" | tr -d '\r' > ~/.ssh/id_rsa_http_handler
114+
echo "${{ secrets.HTTP_REWRITER_ACCESS_TOKEN }}" | tr -d '\r' > ~/.ssh/id_rsa_http_rewriter
115+
chmod 600 ~/.ssh/id_rsa_*
116+
117+
# Add GitHub to known hosts
109118
ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
110119
111120
${{ matrix.settings.build }}
@@ -232,6 +241,8 @@ jobs:
232241
run: |
233242
set -x
234243
244+
export CARGO_NET_GIT_FETCH_WITH_CLI=true
245+
235246
# Install apt dependencies
236247
apt-get update -y
237248
apt-get install -y openssh-client curl
@@ -240,14 +251,16 @@ jobs:
240251
curl https://sh.rustup.rs -sSf | bash -s -- -y -t ${{ matrix.settings.target }}
241252
source "$HOME/.cargo/env"
242253
243-
# Set up SSH key (to checkout private repos with cargo)
254+
# Set up SSH keys (to checkout private repos with cargo)
244255
mkdir -p ~/.ssh
245-
chmod -R 400 ~/.ssh
246-
touch ~/.ssh/config ~/.ssh/known_hosts
247-
eval `ssh-agent -s`
248-
echo "${{ secrets.HTTP_HANDLER_ACCESS_TOKEN }}" | tr -d '\r' | ssh-add -
249-
echo "${{ secrets.HTTP_REWRITER_ACCESS_TOKEN }}" | tr -d '\r' | ssh-add -
250-
ssh-add -l
256+
chmod 700 ~/.ssh
257+
258+
# Save SSH keys to files with specific names
259+
echo "${{ secrets.HTTP_HANDLER_ACCESS_TOKEN }}" | tr -d '\r' > ~/.ssh/id_rsa_http_handler
260+
echo "${{ secrets.HTTP_REWRITER_ACCESS_TOKEN }}" | tr -d '\r' > ~/.ssh/id_rsa_http_rewriter
261+
chmod 600 ~/.ssh/id_rsa_*
262+
263+
# Add GitHub to known hosts
251264
ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
252265
253266
cargo test --target ${{ matrix.settings.target }}

.github/workflows/lint.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Lint
22

3+
env:
4+
CARGO_NET_GIT_FETCH_WITH_CLI: 'true'
5+
36
'on':
47
push:
58
branches:

Cargo.lock

Lines changed: 25 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ crate-type = ["cdylib"]
2020
[dependencies]
2121
async-trait = "0.1.88"
2222
bytes = "1.10.1"
23-
http-handler = { git = "ssh://[email protected]/platformatic/http-handler" }
23+
http-handler = { git = "ssh://[email protected]/platformatic/http-handler.git" }
2424
# http-handler = { path = "../http-handler" }
25-
# http-rewriter = { git = "ssh://[email protected]/platformatic/http-rewriter" }
26-
http-rewriter = { path = "../http-rewriter" }
25+
http-rewriter = { git = "ssh://[email protected]/platformatic/http-rewriter.git" }
26+
# http-rewriter = { path = "../http-rewriter" }
2727
# Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
2828
napi = { version = "3.0.0-beta.8", default-features = false, features = ["napi4"], optional = true }
2929
napi-derive = { version = "3.0.0-beta.8", optional = true }

rust-toolchain.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[toolchain]
2+
channel = "stable"
3+
components = [ "rustfmt", "rustc-dev", "clippy" ]
4+
targets = [ "aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu" ]
5+
profile = "minimal"

0 commit comments

Comments
 (0)