Skip to content

Commit 3bc47da

Browse files
committed
ci: remove unused targets
1 parent 4bc7403 commit 3bc47da

File tree

2 files changed

+0
-42
lines changed

2 files changed

+0
-42
lines changed

.github/workflows/bindgen.yml

Lines changed: 0 additions & 35 deletions
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]
@@ -138,19 +134,6 @@ jobs:
138134
feature_runtime: [0, 1]
139135

140136
include:
141-
# FIXME: Seems installing multiarch packages fails:
142-
#
143-
# https://github.com/rust-lang/rust-bindgen/pull/2037/checks?check_run_id=2441799333
144-
#
145-
# - os: ubuntu-latest
146-
# target:
147-
# debian: arm64
148-
# cross: aarch64-linux-gnu
149-
# rust: aarch64-unknown-linux-gnu
150-
# llvm_version: "16.0"
151-
# main_tests: 0
152-
# release_build: 0
153-
154137
# Ensure stuff works on macos too
155138
- os: macos-latest
156139
llvm_version: "16.0"
@@ -159,26 +142,10 @@ jobs:
159142
steps:
160143
- uses: actions/checkout@v4
161144

162-
- name: Install multiarch packages
163-
if: matrix.target.debian
164-
run: |
165-
sudo apt-get install binfmt-support qemu-user-static gcc-${{matrix.target.cross}} g++-${{matrix.target.cross}}
166-
source /etc/lsb-release
167-
sudo tee /etc/apt/sources.list <<EOF >/dev/null
168-
deb [arch=${{matrix.target.debian}}] http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME main
169-
deb [arch=${{matrix.target.debian}}] http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-updates main
170-
deb [arch=${{matrix.target.debian}}] http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-backports main
171-
deb [arch=${{matrix.target.debian}}] http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-security main
172-
EOF
173-
sudo dpkg --add-architecture ${{matrix.target.debian}}
174-
sudo apt-get update
175-
sudo apt-get install libc6:${{matrix.target.debian}} libstdc++6:${{matrix.target.debian}}
176-
177145
- name: Install stable
178146
uses: dtolnay/rust-toolchain@master
179147
with:
180148
toolchain: stable
181-
target: ${{matrix.target.rust}}
182149
- name: Install libtinfo
183150
if: matrix.os == 'ubuntu-latest'
184151
run: |
@@ -191,8 +158,6 @@ jobs:
191158
- name: Run all the tests
192159
env:
193160
GITHUB_ACTIONS_OS: ${{matrix.os}}
194-
RUST_CROSS_COMPILER: ${{matrix.target.cross}}
195-
RUST_TARGET: ${{matrix.target.rust}}
196161
BINDGEN_MAIN_TESTS: ${{matrix.main_tests}}
197162
BINDGEN_RELEASE_BUILD: ${{matrix.release_build}}
198163
BINDGEN_FEATURE_RUNTIME: ${{matrix.feature_runtime}}

ci/test.sh

Lines changed: 0 additions & 7 deletions
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
@@ -48,10 +45,6 @@ get_cargo_args() {
4845

4946
set_llvm_env
5047

51-
if [ ! -z "$RUST_CROSS_COMPILER" ]; then
52-
export RUSTFLAGS="-C linker=${RUST_CROSS_COMPILER}-gcc"
53-
fi
54-
5548
CARGO_ARGS=`get_cargo_args`
5649

5750
# Ensure we build without warnings

0 commit comments

Comments
 (0)