Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rust 1.74 #2250

Merged
merged 5 commits into from
Dec 25, 2023
Merged

Rust 1.74 #2250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0d52274
config: add `rustc-1.74` build environment
ojeda Dec 14, 2023
8045c42
build-configs.yaml: move `mainline` to Rust 1.74
ojeda Dec 14, 2023
e740056
build-configs.yaml: move `next` to Rust 1.74
ojeda Dec 14, 2023
7cfee6f
build-configs.yaml: move `rust-for-linux_rust-next` to Rust 1.74
ojeda Dec 14, 2023
e3172dc
config: remove unused Rust 1.73 build environment
ojeda Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions config/core/build-configs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ build_environments:
cc_version: 17
arch_params: *clang_15_arch_params

rustc-1.73:
rustc-1.74:
cc: clang
cc_version: 17
arch_params:
Expand Down Expand Up @@ -1211,8 +1211,8 @@ build_configs:
clang-16:
build_environment: clang-16
architectures: *arch_clang_configs
rustc-1.73:
build_environment: rustc-1.73
rustc-1.74:
build_environment: rustc-1.74
fragments: [rust, rust-samples, kselftest]
architectures:
x86_64:
Expand Down Expand Up @@ -1301,8 +1301,8 @@ build_configs:
architectures:
<<: *arch_clang_configs

rustc-1.73:
build_environment: rustc-1.73
rustc-1.74:
build_environment: rustc-1.74
fragments: [rust, rust-samples, kselftest]
architectures:
x86_64:
Expand Down Expand Up @@ -1460,8 +1460,8 @@ build_configs:
tree: rust-for-linux
branch: 'rust-next'
variants:
rustc-1.73:
build_environment: rustc-1.73
rustc-1.74:
build_environment: rustc-1.74
fragments: [rust, rust-for-linux-samples, rust-samples, kselftest]
architectures:
x86_64:
Expand Down
2 changes: 1 addition & 1 deletion config/docker/rustc-1.73-x86.jinja2 → config/docker/rustc-1.74-x86.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{%- set sub_arch = 'amd64' %}
{% extends 'rustc-1.73.jinja2' %}
{% extends 'rustc-1.74.jinja2' %}

{% block packages %}
{{ super() }}
Expand Down
4 changes: 2 additions & 2 deletions config/docker/rustc-1.73.jinja2 → config/docker/rustc-1.74.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
{% block packages %}
{{ super() }}

ARG RUST_VER=1.73.0
ARG RUST_VER=1.74.1
ARG BINDGEN_VER=0.65.1

ARG RUST_TRIPLE=rust-${RUST_VER}-x86_64-unknown-linux-gnu

ENV CARGO_HOME=/home/kernelci/.cargo
ENV PATH=/usr/${RUST_TRIPLE}/bin:${CARGO_HOME}/bin:${PATH}

ARG SHA256SUM=aa4cf0b7e66a9f5b7c623d4b340bb1ac2864a5f2c2b981f39f796245dc84f2cb
ARG SHA256SUM=d206888a2a9d55113940151ba16117ce2456d7de021bab18cfcb06dc48d3157c

# fetch, verify the toolchain
RUN wget https://static.rust-lang.org/dist/${RUST_TRIPLE}.tar.gz && \
Expand Down