Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit cc192bb

Browse files
committedApr 21, 2025··
chore(ci): stop using cross-rs
Signed-off-by: Nathanael DEMACON <[email protected]>
1 parent 685655a commit cc192bb

File tree

3 files changed

+6
-34
lines changed

3 files changed

+6
-34
lines changed
 

‎.github/workflows/push.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -104,19 +104,10 @@ jobs:
104104
- name: Install toolchain
105105
run: rustup toolchain install stable --profile minimal --target ${{ matrix.target.rust-target }} --no-self-update
106106

107-
- name: Install cross
108-
run: cargo install cross --git https://github.com/cross-rs/cross
109-
if: ${{ matrix.target.os != 'windows' && matrix.target.os != 'darwin' }}
110-
111107
- uses: Swatinem/rust-cache@v2
112108

113-
- name: Build using cross
114-
run: cross build --release --target ${{ matrix.target.rust-target }}
115-
if: ${{ matrix.target.os != 'windows' && matrix.target.os != 'darwin' }}
116-
117-
- name: Build using cargo
109+
- name: Build
118110
run: cargo build --release --target ${{ matrix.target.rust-target }}
119-
if: matrix.target.os == 'windows' || matrix.target.os == 'darwin'
120111

121112
- name: Set .exe extension for Windows
122113
id: set_extension

‎.github/workflows/release.yml

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,10 @@ jobs:
4949
- name: Install toolchain
5050
run: rustup toolchain install stable --profile minimal --target ${{ matrix.target.rust-target }} --no-self-update
5151

52-
- name: Install cross
53-
run: cargo install cross --git https://github.com/cross-rs/cross
54-
if: ${{ matrix.target.os != 'windows' && matrix.target.os != 'darwin' }}
55-
5652
- uses: Swatinem/rust-cache@v2
5753

58-
- name: Build using cross
59-
run: cross build --release --target ${{ matrix.target.rust-target }}
60-
if: ${{ matrix.target.os != 'windows' && matrix.target.os != 'darwin' }}
61-
62-
- name: Build using cargo
54+
- name: Build
6355
run: cargo build --release --target ${{ matrix.target.rust-target }}
64-
if: matrix.target.os == 'windows' || matrix.target.os == 'darwin'
6556

6657
- name: Set .exe extension for Windows
6758
id: set_extension
@@ -118,23 +109,9 @@ jobs:
118109
- name: Install toolchain
119110
run: rustup toolchain install stable --profile minimal --target ${{ matrix.target.rust-target }} --no-self-update
120111

121-
- name: Install cross
122-
run: cargo install cross --git https://github.com/cross-rs/cross
123-
124112
- name: Install cargo-deb
125113
run: cargo install cargo-deb
126114

127-
- name: Configure cargo for arm64
128-
if: ${{ matrix.target.arch == 'arm64' }}
129-
run: |
130-
mkdir -p ~/.cargo/
131-
touch ~/.cargo/config
132-
echo "[target.aarch64-unknown-linux-gnu]\nobjcopy = { path = \"aarch64-linux-gnu-objcopy\" }\nstrip = { path = \"aarch64-linux-gnu-strip\" }\n" > ~/.cargo/config
133-
134-
export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc
135-
export CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc
136-
export CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++
137-
138115
- uses: Swatinem/rust-cache@v2
139116

140117
- uses: robinraju/release-downloader@v1.11

‎test

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# ssh config
2+
Host a
3+
IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock" # hello
4+
AddKeysToAgent yes

0 commit comments

Comments
 (0)
Please sign in to comment.