Skip to content

Commit a58f1ee

Browse files
committed
Fixing CI
Fixed x86_64-apple-darwin freezing. Bump all docker to Ubuntu-24.04
1 parent 8c975ef commit a58f1ee

File tree

20 files changed

+21
-37
lines changed

20 files changed

+21
-37
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
- target: aarch64-unknown-linux-gnu
147147
os: ubuntu-latest
148148
- target: x86_64-apple-darwin
149-
os: macos-11
149+
os: macos-13
150150
- target: x86_64-pc-windows-msvc
151151
os: windows-latest
152152
- target: i686-pc-windows-msvc
@@ -175,21 +175,11 @@ jobs:
175175
- uses: actions/checkout@v4
176176
with:
177177
submodules: recursive
178-
- name: Install Rust (rustup)
179-
run: |
180-
rustup update nightly --no-self-update
181-
rustup default nightly
182-
if: matrix.os != 'macos-latest'
183-
- name: Install Rust (macos)
178+
- name: Install Rust
184179
run: |
185-
curl https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly
186-
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
187180
rustup update nightly --no-self-update
188181
rustup default nightly
189-
if: matrix.os == 'macos-latest'
190-
- run: |
191-
rustup default nightly
192-
rustup target add ${{ matrix.target }}
182+
- run: rustup target add ${{ matrix.target }}
193183
if: "!endsWith(matrix.target, 'emulated')"
194184
- name: Setup (aarch64-apple-darwin)
195185
run: |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22
RUN apt-get update && apt-get install -y --no-install-recommends \
33
gcc \
44
g++ \

ci/docker/arm-unknown-linux-gnueabihf/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:24.04
22
RUN apt-get update && apt-get install -y --no-install-recommends \
33
gcc \
44
ca-certificates \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:24.04
22
RUN apt-get update && apt-get install -y --no-install-recommends \
33
gcc-multilib \
44
libc6-dev \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:24.04
22
RUN apt-get update && apt-get install -y --no-install-recommends \
33
gcc-multilib \
44
libc6-dev \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:24.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:24.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:24.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

ci/docker/mipsel-unknown-linux-musl/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:24.04
22

33
RUN apt-get update && \
44
apt-get install -y --no-install-recommends \

ci/docker/nvptx64-nvidia-cuda/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:24.04
22
RUN apt-get update && apt-get install -y --no-install-recommends \
33
gcc \
44
libc6-dev \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:24.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:24.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:24.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:23.04
1+
FROM ubuntu:24.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:24.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
curl ca-certificates \

ci/docker/wasm32-wasip1/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:24.04
22

33
ENV DEBIAN_FRONTEND=noninteractive
44
RUN apt-get update -y && apt-get install -y --no-install-recommends \

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:24.04
22
RUN apt-get update && apt-get install -y --no-install-recommends \
33
gcc \
44
libc6-dev \
@@ -11,4 +11,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
RUN wget https://github.com/gnzlbg/intel_sde/raw/master/sde-external-8.35.0-2019-03-11-lin.tar.bz2
1212
RUN tar -xjf sde-external-8.35.0-2019-03-11-lin.tar.bz2
1313
ENV SKIP_TESTS="avx512bf16"
14-
ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="/sde-external-8.35.0-2019-03-11-lin/sde64 -rtm_mode full --"
14+
ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="/sde-external-8.35.0-2019-03-11-lin/sde64 -rtm_mode full --"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:24.04
22
RUN apt-get update && apt-get install -y --no-install-recommends \
33
gcc \
44
libc6-dev \

crates/core_arch/src/x86/avx2.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5200,9 +5200,6 @@ mod tests {
52005200
}
52015201

52025202
#[simd_test(enable = "avx2")]
5203-
// Miri cannot support this until it is clear how it fits in the Rust memory model
5204-
// (non-temporal store)
5205-
#[cfg_attr(miri, ignore)]
52065203
unsafe fn test_mm256_stream_load_si256() {
52075204
let a = _mm256_set_epi64x(5, 6, 7, 8);
52085205
let r = _mm256_stream_load_si256(core::ptr::addr_of!(a) as *const _);

crates/core_arch/src/x86/sse41.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1958,9 +1958,6 @@ mod tests {
19581958
}
19591959

19601960
#[simd_test(enable = "sse4.1")]
1961-
// Miri cannot support this until it is clear how it fits in the Rust memory model
1962-
// (non-temporal store)
1963-
#[cfg_attr(miri, ignore)]
19641961
unsafe fn test_mm_stream_load_si128() {
19651962
let a = _mm_set_epi64x(5, 6);
19661963
let r = _mm_stream_load_si128(core::ptr::addr_of!(a) as *const _);

0 commit comments

Comments
 (0)