Skip to content

Commit fe8d1aa

Browse files
committed
fix(cd): enable cross compilation
1 parent 3f4f742 commit fe8d1aa

File tree

1 file changed

+24
-25
lines changed

1 file changed

+24
-25
lines changed

.github/workflows/cd.yml

+24-25
Original file line numberDiff line numberDiff line change
@@ -17,91 +17,91 @@ jobs:
1717
OS: ubuntu-22.04,
1818
TOOLCHAIN: stable,
1919
TARGET: x86_64-unknown-linux-gnu,
20-
ALL_FEATURES: true,
20+
ARGS: "",
2121
}
2222
- {
2323
OS: ubuntu-22.04,
2424
TOOLCHAIN: stable,
2525
TARGET: x86_64-unknown-linux-musl,
26-
ALL_FEATURES: true,
26+
ARGS: "",
2727
}
2828
- {
2929
OS: ubuntu-22.04,
3030
TOOLCHAIN: stable,
3131
TARGET: aarch64-unknown-linux-gnu,
32-
ALL_FEATURES: true,
32+
ARGS: "",
3333
}
3434
- {
3535
OS: ubuntu-22.04,
3636
TOOLCHAIN: stable,
3737
TARGET: riscv64gc-unknown-linux-gnu,
38-
ALL_FEATURES: true,
38+
ARGS: "",
3939
}
4040
- {
4141
OS: ubuntu-22.04,
4242
TOOLCHAIN: stable,
4343
TARGET: i686-unknown-linux-gnu,
44-
ALL_FEATURES: false,
44+
ARGS: "--no-default-features",
4545
}
4646
- {
4747
OS: ubuntu-22.04,
4848
TOOLCHAIN: stable,
4949
TARGET: i686-unknown-linux-musl,
50-
ALL_FEATURES: false,
50+
ARGS: "--no-default-features",
5151
}
5252
- {
5353
OS: ubuntu-22.04,
5454
TOOLCHAIN: stable,
5555
TARGET: aarch64-unknown-linux-musl,
56-
ALL_FEATURES: false,
56+
ARGS: "--no-default-features",
5757
}
5858
- {
5959
OS: ubuntu-22.04,
6060
TOOLCHAIN: stable,
6161
TARGET: armv5te-unknown-linux-gnueabi,
62-
ALL_FEATURES: false,
62+
ARGS: "--no-default-features",
6363
}
6464
- {
6565
OS: ubuntu-22.04,
6666
TOOLCHAIN: stable,
6767
TARGET: armv7-unknown-linux-gnueabihf,
68-
ALL_FEATURES: false,
68+
ARGS: "--no-default-features",
6969
}
7070
- {
7171
OS: ubuntu-22.04,
7272
TOOLCHAIN: stable,
7373
TARGET: arm-unknown-linux-gnueabi,
74-
ALL_FEATURES: false,
74+
ARGS: "--no-default-features",
7575
}
7676
- {
7777
OS: ubuntu-22.04,
7878
TOOLCHAIN: stable,
7979
TARGET: arm-unknown-linux-gnueabihf,
80-
ALL_FEATURES: false,
80+
ARGS: "--no-default-features",
8181
}
8282
- {
8383
OS: ubuntu-22.04,
8484
TOOLCHAIN: stable,
8585
TARGET: powerpc64le-unknown-linux-gnu,
86-
ALL_FEATURES: false,
86+
ARGS: "--no-default-features",
8787
}
8888
- {
8989
OS: windows-2022,
9090
TOOLCHAIN: stable,
9191
TARGET: x86_64-pc-windows-msvc,
92-
ALL_FEATURES: false,
92+
ARGS: "--no-default-features",
9393
}
9494
- {
9595
OS: macos-14,
9696
TOOLCHAIN: stable,
9797
TARGET: x86_64-apple-darwin,
98-
ALL_FEATURES: false,
98+
ARGS: "--no-default-features",
9999
}
100100
- {
101101
OS: macos-14,
102102
TOOLCHAIN: stable,
103103
TARGET: aarch64-apple-darwin,
104-
ALL_FEATURES: false,
104+
ARGS: "--no-default-features",
105105
}
106106
steps:
107107
- name: Checkout the repository
@@ -111,22 +111,21 @@ jobs:
111111
run: echo "RELEASE_VERSION=${GITHUB_REF:11}" >> $GITHUB_ENV
112112

113113
- name: Install Rust toolchain
114-
uses: dtolnay/rust-toolchain@master
114+
uses: actions-rs/toolchain@v1
115115
with:
116116
toolchain: ${{ matrix.build.TOOLCHAIN }}
117-
targets: ${{ matrix.build.TARGET }}
117+
target: ${{ matrix.build.TARGET }}
118+
override: true
118119

119120
- name: Cache Cargo dependencies
120121
uses: Swatinem/rust-cache@v2
121122

122123
- name: Build
123-
shell: bash
124-
run: |
125-
if [ "${{ matrix.build.ALL_FEATURES }}" = true ]; then
126-
cargo build --release --locked --target ${{ matrix.build.TARGET }}
127-
else
128-
cargo build --release --no-default-features --locked --target ${{ matrix.build.TARGET }}
129-
fi
124+
uses: actions-rs/cargo@v1
125+
with:
126+
use-cross: ${{ matrix.build.OS != 'windows-2022' }}
127+
command: build
128+
args: --release --locked --target ${{ matrix.build.TARGET }} ${{ matrix.build.ARGS }}
130129

131130
- name: Prepare release assets
132131
shell: bash
@@ -136,7 +135,7 @@ jobs:
136135
if [ "${{ matrix.build.OS }}" = "windows-2022" ]; then
137136
cp target/${{ matrix.build.TARGET }}/release/binsider.exe release/
138137
else
139-
cp target/${{ matrix.build.TARGET }}/release/binsider release/ && strip -s release/binsider
138+
cp target/${{ matrix.build.TARGET }}/release/binsider release/
140139
fi
141140
mv release/ binsider-${{env.RELEASE_VERSION}}/
142141

0 commit comments

Comments
 (0)