Skip to content

Commit b213064

Browse files
authored
Revert "make it easier for individual operators to upgrade rust before templating (#317)" (#318)
This reverts commit edf2c57.
1 parent 647d791 commit b213064

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

template/.github/workflows/build.yml.j2

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ env:
2121
CARGO_TERM_COLOR: always
2222
CARGO_INCREMENTAL: '0'
2323
CARGO_PROFILE_DEV_DEBUG: '0'
24-
RUST_TOOLCHAIN_VERSION: "{[ rust_version }]"
2524
RUSTFLAGS: "-D warnings"
2625
RUSTDOCFLAGS: "-D warnings"
2726
RUST_LOG: "info"
@@ -45,7 +44,7 @@ jobs:
4544
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
4645
with:
4746
submodules: recursive
48-
- uses: dtolnay/rust-toolchain@${{ env.RUST_TOOLCHAIN_VERSION }}
47+
- uses: dtolnay/rust-toolchain@{[ rust_version }]
4948
- uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
5049
with:
5150
key: udeps
@@ -123,7 +122,7 @@ jobs:
123122
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
124123
with:
125124
submodules: recursive
126-
- uses: dtolnay/rust-toolchain@${{ env.RUST_TOOLCHAIN_VERSION }}
125+
- uses: dtolnay/rust-toolchain@{[ rust_version }]
127126
with:
128127
components: rustfmt
129128
- run: cargo fmt --all -- --check
@@ -140,7 +139,7 @@ jobs:
140139
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
141140
with:
142141
submodules: recursive
143-
- uses: dtolnay/rust-toolchain@${{ env.RUST_TOOLCHAIN_VERSION }}
142+
- uses: dtolnay/rust-toolchain@{[ rust_version }]
144143
with:
145144
components: clippy
146145
- uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
@@ -175,7 +174,7 @@ jobs:
175174
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
176175
with:
177176
submodules: recursive
178-
- uses: dtolnay/rust-toolchain@${{ env.RUST_TOOLCHAIN_VERSION }}
177+
- uses: dtolnay/rust-toolchain@{[ rust_version }]
179178
with:
180179
components: rustfmt
181180
- uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
@@ -196,7 +195,7 @@ jobs:
196195
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
197196
with:
198197
submodules: recursive
199-
- uses: dtolnay/rust-toolchain@${{ env.RUST_TOOLCHAIN_VERSION }}
198+
- uses: dtolnay/rust-toolchain@{[ rust_version }]
200199
- uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
201200
with:
202201
key: test
@@ -259,7 +258,7 @@ jobs:
259258
with:
260259
version: v3.13.3
261260
- name: Set up cargo
262-
uses: dtolnay/rust-toolchain@${{ env.RUST_TOOLCHAIN_VERSION }}
261+
uses: dtolnay/rust-toolchain@{[ rust_version }]
263262
- uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
264263
with:
265264
key: charts
@@ -319,7 +318,7 @@ jobs:
319318
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
320319
with:
321320
submodules: recursive
322-
- uses: dtolnay/rust-toolchain@${{ env.RUST_TOOLCHAIN_VERSION }}
321+
- uses: dtolnay/rust-toolchain@{[ rust_version }]
323322
with:
324323
components: rustfmt
325324
# This step checks if the current run was triggered by a push to a pr (or a pr being created).

0 commit comments

Comments
 (0)