Skip to content

Commit 1fa222e

Browse files
committed
Remove x86_64-unknown-linux-gnu run
+ Rename `x86_64-unknown-linux-gnu-emulated` run to `x86_64-unknown-linux-gnu`
1 parent 1767c64 commit 1fa222e

File tree

6 files changed

+15
-26
lines changed

6 files changed

+15
-26
lines changed

.github/workflows/main.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ jobs:
5050
os: ubuntu-latest
5151
- tuple: x86_64-unknown-linux-gnu
5252
os: ubuntu-latest
53-
- tuple: x86_64-unknown-linux-gnu-emulated
54-
os: ubuntu-latest
5553
- tuple: arm-unknown-linux-gnueabihf
5654
os: ubuntu-latest
5755
- tuple: armv7-unknown-linux-gnueabihf
@@ -156,7 +154,7 @@ jobs:
156154
os: ubuntu-latest
157155
test_everything: true
158156
- target:
159-
tuple: x86_64-unknown-linux-gnu-emulated
157+
tuple: x86_64-unknown-linux-gnu
160158
os: ubuntu-latest
161159
test_everything: true
162160
# MIPS targets disabled since they are dropped to tier 3.
@@ -199,7 +197,6 @@ jobs:
199197
rustup update nightly --no-self-update
200198
rustup default nightly
201199
- run: rustup target add ${{ matrix.target.tuple }}
202-
if: "!endsWith(matrix.target.tuple, 'emulated')"
203200
- run: cargo generate-lockfile
204201

205202
# Configure some env vars based on matrix configuration

ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile

-18
This file was deleted.

ci/docker/x86_64-unknown-linux-gnu/Dockerfile

+12-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
44
libc6-dev \
55
file \
66
make \
7-
ca-certificates
7+
ca-certificates \
8+
wget \
9+
xz-utils
10+
11+
RUN wget http://ci-mirrors.rust-lang.org/stdarch/sde-external-9.53.0-2025-03-16-lin.tar.xz -O sde.tar.xz
12+
RUN mkdir intel-sde
13+
RUN tar -xJf sde.tar.xz --strip-components=1 -C intel-sde
14+
ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="/intel-sde/sde64 \
15+
-cpuid-in /checkout/ci/docker/x86_64-unknown-linux-gnu/cpuid.def \
16+
-rtm-mode full -tsx --"
17+
# These tests fail with SDE as it doesn't support saving register data
18+
ENV STDARCH_TEST_SKIP_FUNCTION="xsave,xsaveopt,xsave64,xsaveopt64"

ci/run-docker.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ if [ $# -lt 1 ]; then
1111
fi
1212

1313
run() {
14-
target=$(echo "${1}" | sed 's/-emulated//')
1514
echo "Building docker container for TARGET=${1}"
1615
docker build -t stdarch -f "ci/docker/${1}/Dockerfile" ci/
1716
mkdir -p target c_programs rust_programs
@@ -22,7 +21,7 @@ run() {
2221
--user "$(id -u)":"$(id -g)" \
2322
--env CARGO_HOME=/cargo \
2423
--env CARGO_TARGET_DIR=/checkout/target \
25-
--env TARGET="${target}" \
24+
--env TARGET="${1}" \
2625
--env STDARCH_TEST_EVERYTHING \
2726
--env STDARCH_DISABLE_ASSERT_INSTR \
2827
--env NOSTD \

ci/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ fi
9999

100100
# Test targets compiled with extra features.
101101
case ${TARGET} in
102-
x86_64*emulated)
102+
x86_64-unknown-linux-gnu)
103103
export STDARCH_DISABLE_ASSERT_INSTR=1
104104

105105
export RUSTFLAGS="${RUSTFLAGS} -C target-feature=+avx"

0 commit comments

Comments
 (0)