Skip to content

Commit 798d618

Browse files
committed
ci: remove unused targets
1 parent 42218df commit 798d618

File tree

2 files changed

+0
-43
lines changed

2 files changed

+0
-43
lines changed

.github/workflows/bindgen.yml

-36
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,6 @@ jobs:
125125
strategy:
126126
matrix:
127127
os: [ubuntu-latest]
128-
target:
129-
- debian: null
130-
cross: null
131-
rust: null
132128
llvm_version: ["9.0", "16.0"]
133129
main_tests: [1]
134130
release_build: [0, 1]
@@ -147,20 +143,6 @@ jobs:
147143
no_default_features: 0
148144
feature_extra_asserts: 1
149145

150-
# FIXME: Seems installing multiarch packages fails:
151-
#
152-
# https://github.com/rust-lang/rust-bindgen/pull/2037/checks?check_run_id=2441799333
153-
#
154-
# - os: ubuntu-latest
155-
# target:
156-
# debian: arm64
157-
# cross: aarch64-linux-gnu
158-
# rust: aarch64-unknown-linux-gnu
159-
# llvm_version: "16.0"
160-
# main_tests: 0
161-
# release_build: 0
162-
# feature_extra_asserts: 0
163-
164146
# Ensure stuff works on macos too
165147
- os: macos-latest
166148
llvm_version: "16.0"
@@ -170,26 +152,10 @@ jobs:
170152
steps:
171153
- uses: actions/checkout@v4
172154

173-
- name: Install multiarch packages
174-
if: matrix.target.debian
175-
run: |
176-
sudo apt-get install binfmt-support qemu-user-static gcc-${{matrix.target.cross}} g++-${{matrix.target.cross}}
177-
source /etc/lsb-release
178-
sudo tee /etc/apt/sources.list <<EOF >/dev/null
179-
deb [arch=${{matrix.target.debian}}] http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME main
180-
deb [arch=${{matrix.target.debian}}] http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-updates main
181-
deb [arch=${{matrix.target.debian}}] http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-backports main
182-
deb [arch=${{matrix.target.debian}}] http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-security main
183-
EOF
184-
sudo dpkg --add-architecture ${{matrix.target.debian}}
185-
sudo apt-get update
186-
sudo apt-get install libc6:${{matrix.target.debian}} libstdc++6:${{matrix.target.debian}}
187-
188155
- name: Install stable
189156
uses: dtolnay/rust-toolchain@master
190157
with:
191158
toolchain: stable
192-
target: ${{matrix.target.rust}}
193159
- name: Install libtinfo
194160
if: matrix.os == 'ubuntu-latest'
195161
run: |
@@ -202,8 +168,6 @@ jobs:
202168
- name: Run all the tests
203169
env:
204170
GITHUB_ACTIONS_OS: ${{matrix.os}}
205-
RUST_CROSS_COMPILER: ${{matrix.target.cross}}
206-
RUST_TARGET: ${{matrix.target.rust}}
207171
BINDGEN_MAIN_TESTS: ${{matrix.main_tests}}
208172
BINDGEN_RELEASE_BUILD: ${{matrix.release_build}}
209173
BINDGEN_FEATURE_RUNTIME: ${{matrix.feature_runtime}}

ci/test.sh

-7
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ assert_no_diff() {
2727

2828
get_cargo_args() {
2929
local args=""
30-
if [ ! -z "$RUST_TARGET" ]; then
31-
args+=" --target $RUST_TARGET"
32-
fi
3330
if [ "$BINDGEN_RELEASE_BUILD" == "1" ]; then
3431
args+=" --release"
3532
fi
@@ -51,10 +48,6 @@ get_cargo_args() {
5148

5249
set_llvm_env
5350

54-
if [ ! -z "$RUST_CROSS_COMPILER" ]; then
55-
export RUSTFLAGS="-C linker=${RUST_CROSS_COMPILER}-gcc"
56-
fi
57-
5851
CARGO_ARGS=`get_cargo_args`
5952

6053
# Ensure we build without warnings

0 commit comments

Comments
 (0)