Skip to content

Commit 52035e1

Browse files
snoggetgross35
authored andcommitted
gnu: Set up the CI for _TIME_BITS=64
Add new jobs for i686 in test_tier1 and arm and powerpc in test_tier2 where RUST_LIBC_UNSTABLE_GNU_TIME_BITS=64. Use artifact-tag to avoid artifact name collisions. (backport <rust-lang#4433>) (cherry picked from commit 352274a)
1 parent 4e7a641 commit 52035e1

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

.github/workflows/ci.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,12 @@ jobs:
9999
artifact-tag: offset-bits64
100100
env:
101101
RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS: 64
102+
- target: i686-unknown-linux-gnu
103+
docker: true
104+
os: ubuntu-24.04
105+
artifact-tag: time-bits64
106+
env:
107+
RUST_LIBC_UNSTABLE_GNU_TIME_BITS: 64
102108
- target: x86_64-unknown-linux-gnu
103109
docker: true
104110
os: ubuntu-24.04
@@ -196,6 +202,10 @@ jobs:
196202
env:
197203
RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS: 64
198204
artifact-tag: offset-bits64
205+
- target: arm-unknown-linux-gnueabihf
206+
env:
207+
RUST_LIBC_UNSTABLE_GNU_TIME_BITS: 64
208+
artifact-tag: time-bits64
199209
- target: aarch64-unknown-linux-musl
200210
env:
201211
RUST_LIBC_UNSTABLE_MUSL_V1_2_3: 1
@@ -215,6 +225,10 @@ jobs:
215225
# env:
216226
# RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS: 64
217227
# artifact-tag: offset-bits64
228+
# - target: powerpc-unknown-linux-gnu
229+
# env:
230+
# RUST_LIBC_UNSTABLE_GNU_TIME_BITS: 64
231+
# artifact-tag: time-bits64
218232
timeout-minutes: 25
219233
env:
220234
TARGET: ${{ matrix.target }}

ci/run-docker.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ run() {
4444
--env LIBC_CI \
4545
--env LIBC_CI_ZBUILD_STD \
4646
--env RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS \
47+
--env RUST_LIBC_UNSTABLE_GNU_TIME_BITS \
4748
--env CARGO_HOME=/cargo \
4849
--env CARGO_TARGET_DIR=/checkout/target \
4950
--volume "$CARGO_HOME":/cargo \

ci/verify-build.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,12 @@ test_target() {
7676
# Test with the equivalent of __USE_TIME_BITS64
7777
RUST_LIBC_UNSTABLE_LINUX_TIME_BITS64=1 $cmd
7878
case "$target" in
79-
# Test with the equivalent of __FILE_OFFSET_BITS=64
8079
arm*-gnu*|i*86*-gnu|powerpc-*-gnu*|mips*-gnu|sparc-*-gnu|thumb-*gnu*)
81-
RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS=64 $cmd;;
80+
# Test with the equivalent of _FILE_OFFSET_BITS=64
81+
RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS=64 $cmd
82+
# Test with the equivalent of _TIME_BITS=64
83+
RUST_LIBC_UNSTABLE_GNU_TIME_BITS=64 $cmd
84+
;;
8285
esac
8386
fi
8487

0 commit comments

Comments
 (0)