Apply feedback

template/base/.github/actions/setup/action.yml.njk

@@ -61,14 +61,14 @@ runs:
       if: {% raw %}${{ inputs.rustfmt == 'true' }}{% endraw %}
       uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: {% raw %}${{ env.RUSTFMT_NIGHTLY_VERSION }}{% endraw %}
+        toolchain: {% raw %}${{ env.TOOLCHAIN_FORMAT }}{% endraw %}
         components: rustfmt
 
     - name: Install Clippy
       if: {% raw %}${{ inputs.clippy == 'true' }}{% endraw %}
       uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: {% raw %}${{ env.CLIPPY_NIGHTLY_VERSION }}{% endraw %}
+        toolchain: {% raw %}${{ env.TOOLCHAIN_LINT }}{% endraw %}
         components: clippy
 
     - name: Install Solana

template/base/Cargo.toml.njk

@@ -2,6 +2,8 @@
 resolver = "2"
 members = ["program"]
 
-[workspace.metadata.toolchain]
-lint = "{{ toolchain }}"
+# Specify Rust toolchains for rustfmt, clippy, and build.
+# Any unprovided toolchains default to stable.
+[workspace.metadata.toolchains]
 format = "{{ toolchain }}"
+lint = "{{ toolchain }}"

template/base/scripts/ci/set-env.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env zx
 import { getToolchain } from '../utils.mjs';
 
-await $`echo "RUSTFMT_NIGHTLY_VERSION=${getToolchain('format')}" >> $GITHUB_ENV`;
-await $`echo "CLIPPY_NIGHTLY_VERSION=${getToolchain('lint')}" >> $GITHUB_ENV`;
+await $`echo "TOOLCHAIN_FORMAT=${getToolchain('format')}" >> $GITHUB_ENV`;
+await $`echo "TOOLCHAIN_LINT=${getToolchain('lint')}" >> $GITHUB_ENV`;

template/base/scripts/utils.mjs

@@ -85,7 +85,7 @@ export function getCargoMetadata(folder) {
 }
 
 export function getToolchain(operation) {
-  return getCargoMetadata()?.toolchain?.[operation];
+  return getCargoMetadata()?.toolchains?.[operation];
 }
 
 export function getToolchainArgument(operation) {