Skip to content

Commit de4efcd

Browse files
authored
fix(build): Pin to Rust 1.83.0. (#1368)
* Pin to Rust 1.83.0 Some crates used in this repository won't compile with Rust 1.84.0. Also switch to using 'tq' binary instead of 'tomlq', as noted by the tomlq crate's warning message. * Two more places where 'stable' needs to be '1.83.0'.
1 parent 7b4df0e commit de4efcd

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/pr_test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- name: "Checkout code"
1212
uses: actions/checkout@v4
1313
- name: "Install Rust"
14-
uses: dtolnay/rust-toolchain@stable # to install tomlq via `make config`
14+
uses: dtolnay/rust-toolchain@1.83.0 # to install tq via `make config`
1515
- name: "Generate static app config"
1616
run: make config
1717
- name: "Config Artifact"
@@ -25,7 +25,7 @@ jobs:
2525
- name: "Checkout code"
2626
uses: actions/checkout@v4
2727
- name: "Install Rust"
28-
uses: dtolnay/rust-toolchain@stable # to install tomlq via `make config`
28+
uses: dtolnay/rust-toolchain@1.83.0 # to install tq via `make config`
2929
- name: Install Go
3030
uses: actions/setup-go@v5
3131
with:
@@ -124,11 +124,11 @@ jobs:
124124
path: ${{ steps.go-cache-paths.outputs.gomod }}
125125
key: ${{ runner.os }}-test-go-mod-${{ hashFiles('**/go.sum') }}
126126
- name: "Install Rust"
127-
uses: dtolnay/rust-toolchain@stable
127+
uses: dtolnay/rust-toolchain@1.83.0
128128
- name: "Add wasm32-wasi Rust target"
129-
run: rustup target add wasm32-wasi --toolchain stable
129+
run: rustup target add wasm32-wasi --toolchain 1.83.0
130130
- name: "Validate Rust toolchain"
131-
run: rustup show && rustup target list --installed --toolchain stable
131+
run: rustup show && rustup target list --installed --toolchain 1.83.0
132132
shell: bash
133133
- name: "Install Node"
134134
uses: actions/setup-node@v4

.github/workflows/tag_to_draft_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: "Set GOHOSTOS and GOHOSTARCH"
2020
run: echo "GOHOSTOS=$(go env GOHOSTOS)" >> $GITHUB_ENV && echo "GOHOSTARCH=$(go env GOHOSTARCH)" >> $GITHUB_ENV
2121
- name: "Install Rust"
22-
uses: dtolnay/rust-toolchain@stable
22+
uses: dtolnay/rust-toolchain@1.83.0
2323
- name: "Generate static app config"
2424
run: make config
2525
# Passing the raw SSH private key causes an error:

Dockerfile-rust

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM rust:latest
22
LABEL maintainer="Fastly OSS <oss@fastly.com>"
33

4-
ENV RUST_TOOLCHAIN=stable
4+
ENV RUST_TOOLCHAIN=1.83.0
55
RUN rustup toolchain install ${RUST_TOOLCHAIN} \
66
&& rustup target add wasm32-wasi --toolchain ${RUST_TOOLCHAIN} \
77
&& apt-get update && apt-get install -y curl jq && apt-get -y clean && rm -rf /var/lib/apt/lists/* \

0 commit comments

Comments
 (0)