Skip to content

Commit b200911

Browse files
LucasSteLucasSte
committed
[SOL] Adjustments for Rust 1.89.0
1 parent 0922f38 commit b200911

File tree

7 files changed

+39
-35
lines changed

7 files changed

+39
-35
lines changed

‎.github/workflows/main.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ jobs:
9494
test_verbatim: 1
9595
- target: i686-pc-windows-gnu
9696
os: windows-2025
97-
channel: nightly-i686-gnu
97+
channel: nightly-2024-11-29-i686-gnu
9898
- target: x86_64-pc-windows-gnu
9999
os: windows-2025
100-
channel: nightly-x86_64-gnu
100+
channel: nightly-2024-11-29-x86_64-gnu
101101
runs-on: ${{ matrix.os }}
102102
needs: [calculate_vars]
103103
env:
@@ -113,7 +113,7 @@ jobs:
113113
- name: Install Rust (rustup)
114114
shell: bash
115115
run: |
116-
channel="nightly"
116+
channel="nightly-2024-11-29"
117117
# Account for channels that have required components (MinGW)
118118
[ -n "${{ matrix.channel }}" ] && channel="${{ matrix.channel }}"
119119
rustup update "$channel" --no-self-update

‎Cargo.toml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,3 @@ lto = "fat"
4949
[profile.bench]
5050
# Required for iai-callgrind
5151
debug = true
52-
53-
[lints.rust]
54-
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_family, values("solana"))', 'cfg(target_feature, values("static-syscalls"))', 'cfg(target_os, values("solana"))'] }

‎ci/docker/sbpf-solana-solana/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v -
1010
RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/
1111

1212
RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
13-
--rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \
13+
--rev ccfb0a3f5f967f3cf52fef0c95e283c7cab1836e \
1414
--bin cargo-run-solana-tests --root /usr/local
1515

16-
RUN mkdir -p /tmp/.cache/solana/v1.50/platform-tools
17-
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.50/platform-tools-linux-x86_64.tar.bz2
18-
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.50/platform-tools
19-
RUN rustup toolchain link solana /tmp/.cache/solana/v1.50/platform-tools/rust
16+
RUN mkdir -p /tmp/.cache/solana/v1.51/platform-tools
17+
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.51/platform-tools-linux-x86_64.tar.bz2
18+
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.51/platform-tools
19+
RUN rustup toolchain link solana /tmp/.cache/solana/v1.51/platform-tools/rust
2020
RUN cp -R ${HOME}/.rustup /tmp/
2121

2222
ENV CARGO_TARGET_SBPF_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
23-
ENV LLVM_HOME="/tmp/.cache/solana/v1.50/platform-tools/llvm"
24-
ENV CC="/tmp/.cache/solana/v1.50/platform-tools/llvm/bin/clang"
23+
ENV LLVM_HOME="/tmp/.cache/solana/v1.51/platform-tools/llvm"
24+
ENV CC="/tmp/.cache/solana/v1.51/platform-tools/llvm/bin/clang"
2525
ENV RUSTUP_TOOLCHAIN="solana"

‎ci/docker/sbpfv1-solana-solana/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v -
1010
RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/
1111

1212
RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
13-
--rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \
13+
--rev ccfb0a3f5f967f3cf52fef0c95e283c7cab1836e \
1414
--bin cargo-run-solana-tests --root /usr/local
1515

16-
RUN mkdir -p /tmp/.cache/solana/v1.50/platform-tools
17-
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.50/platform-tools-linux-x86_64.tar.bz2
18-
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.50/platform-tools
19-
RUN rustup toolchain link solana /tmp/.cache/solana/v1.50/platform-tools/rust
16+
RUN mkdir -p /tmp/.cache/solana/v1.51/platform-tools
17+
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.51/platform-tools-linux-x86_64.tar.bz2
18+
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.51/platform-tools
19+
RUN rustup toolchain link solana /tmp/.cache/solana/v1.51/platform-tools/rust
2020
RUN cp -R ${HOME}/.rustup /tmp/
2121

2222
ENV CARGO_TARGET_SBPFV1_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
23-
ENV LLVM_HOME="/tmp/.cache/solana/v1.50/platform-tools/llvm"
24-
ENV CC="/tmp/.cache/solana/v1.50/platform-tools/llvm/bin/clang"
23+
ENV LLVM_HOME="/tmp/.cache/solana/v1.51/platform-tools/llvm"
24+
ENV CC="/tmp/.cache/solana/v1.51/platform-tools/llvm/bin/clang"
2525
ENV RUSTUP_TOOLCHAIN="solana"

‎ci/docker/sbpfv2-solana-solana/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v -
1010
RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/
1111

1212
RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
13-
--rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \
13+
--rev ccfb0a3f5f967f3cf52fef0c95e283c7cab1836e \
1414
--bin cargo-run-solana-tests --root /usr/local
1515

16-
RUN mkdir -p /tmp/.cache/solana/v1.50/platform-tools
17-
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.50/platform-tools-linux-x86_64.tar.bz2
18-
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.50/platform-tools
19-
RUN rustup toolchain link solana /tmp/.cache/solana/v1.50/platform-tools/rust
16+
RUN mkdir -p /tmp/.cache/solana/v1.51/platform-tools
17+
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.51/platform-tools-linux-x86_64.tar.bz2
18+
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.51/platform-tools
19+
RUN rustup toolchain link solana /tmp/.cache/solana/v1.51/platform-tools/rust
2020
RUN cp -R ${HOME}/.rustup /tmp/
2121

2222
ENV CARGO_TARGET_SBPFV2_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
23-
ENV LLVM_HOME="/tmp/.cache/solana/v1.50/platform-tools/llvm"
24-
ENV CC="/tmp/.cache/solana/v1.50/platform-tools/llvm/bin/clang"
23+
ENV LLVM_HOME="/tmp/.cache/solana/v1.51/platform-tools/llvm"
24+
ENV CC="/tmp/.cache/solana/v1.51/platform-tools/llvm/bin/clang"
2525
ENV RUSTUP_TOOLCHAIN="solana"

‎ci/docker/sbpfv3-solana-solana/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v -
1010
RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/
1111

1212
RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
13-
--rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \
13+
--rev ccfb0a3f5f967f3cf52fef0c95e283c7cab1836e \
1414
--bin cargo-run-solana-tests --root /usr/local
1515

16-
RUN mkdir -p /tmp/.cache/solana/v1.50/platform-tools
17-
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.50/platform-tools-linux-x86_64.tar.bz2
18-
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.50/platform-tools
19-
RUN rustup toolchain link solana /tmp/.cache/solana/v1.50/platform-tools/rust
16+
RUN mkdir -p /tmp/.cache/solana/v1.51/platform-tools
17+
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.51/platform-tools-linux-x86_64.tar.bz2
18+
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.51/platform-tools
19+
RUN rustup toolchain link solana /tmp/.cache/solana/v1.51/platform-tools/rust
2020
RUN cp -R ${HOME}/.rustup /tmp/
2121

2222
ENV CARGO_TARGET_SBPFV3_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
23-
ENV LLVM_HOME="/tmp/.cache/solana/v1.50/platform-tools/llvm"
24-
ENV CC="/tmp/.cache/solana/v1.50/platform-tools/llvm/bin/clang"
23+
ENV LLVM_HOME="/tmp/.cache/solana/v1.51/platform-tools/llvm"
24+
ENV CC="/tmp/.cache/solana/v1.51/platform-tools/llvm/bin/clang"
2525
ENV RUSTUP_TOOLCHAIN="solana"

‎compiler-builtins/Cargo.toml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,11 @@ unstable-public-internals = []
6161

6262
[lints.rust]
6363
# The cygwin config can be dropped after our benchmark toolchain is bumped
64-
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(bootstrap)', 'cfg(target_os, values("cygwin"))'] }
64+
unexpected_cfgs = { level = "warn", check-cfg = [
65+
'cfg(bootstrap)',
66+
'cfg(target_os, values("cygwin"))',
67+
'cfg(target_family, values("solana"))',
68+
'cfg(target_feature, values("static-syscalls"))',
69+
'cfg(target_os, values("solana"))'
70+
] }
71+

0 commit comments

Comments
 (0)