review pt2

Author: buffalojoec

.github/actions/setup/action.yml

@@ -17,7 +17,7 @@ inputs:
     description: Install Solana if `true`. Defaults to `false`.
     required: false
   toolchain:
-    description: Rust toolchain to install. Comma-separated string of [`build`, `format`, `lint`, `test`].
+    description: Rust toolchain to install. Comma-separated string of [`format`, `lint`, `test`].
     required: false
 
 runs:
@@ -46,12 +46,6 @@ runs:
       run: pnpm install --frozen-lockfile
       shell: bash
 
-    - name: Install Rust 'build' Toolchain
-      if: ${{ contains(inputs.toolchain, 'build') }}
-      uses: dtolnay/rust-toolchain@master
-      with:
-        toolchain: stable
-
     - name: Install Rust 'format' Toolchain
       if: ${{ contains(inputs.toolchain, 'format') }}
       uses: dtolnay/rust-toolchain@master

.github/workflows/main.yml

@@ -122,7 +122,6 @@ jobs:
       - name: Setup Environment
         uses: ./.github/actions/setup
         with:
-          toolchain: build
           cargo-cache-key: cargo-program
           solana: true
 

.github/workflows/publish-rust-client.yml renamed to .github/workflows/publish-rust-crate.yml

@@ -6,7 +6,12 @@ on:
       package_path:
         description: Path to directory with package to release
         required: true
-        type: string
+        default: 'clients/rust'
+        type: choice
+        options:
+          - clients/rust
+          - interface
+          - program
       level:
         description: Level
         required: true
@@ -47,14 +52,14 @@ jobs:
       - name: Setup Environment
         uses: ./.github/actions/setup
         with:
-          cargo-cache-key: cargo-rust-${{ github.event.inputs.package_path }}
+          cargo-cache-key: cargo-rust-${{ inputs.package_path }}
           clippy: true
           rustfmt: true
           solana: true
 
       - name: Convert package_path to required variables
         run: |
-          PACKAGE_PATH="${{ github.event.inputs.package_path }}"
+          PACKAGE_PATH="${{ inputs.package_path }}"
           RECIPE_SUFFIX="${PACKAGE_PATH//\//-}"
           TAG_PREFIX="$(basename "$PACKAGE_PATH")"
 
@@ -67,8 +72,8 @@ jobs:
       - name: Lint
         run: make clippy-${{ env.RECIPE_SUFFIX }}
 
-      - name: Build
-        run: make build-${{ env.RECIPE_SUFFIX }}
+      - name: Build Program
+        run: make build-program
 
       - name: Test
         run: make test-${{ env.RECIPE_SUFFIX }}
@@ -86,8 +91,8 @@ jobs:
       - name: Setup Environment
         uses: ./.github/actions/setup
         with:
-          cargo-cache-key: cargo-publish-rust-${{ github.event.inputs.package_path }}
-          cargo-cache-fallback-key: cargo-rust-${{ github.event.inputs.package_path }}
+          cargo-cache-key: cargo-publish-rust-${{ inputs.package_path }}
+          cargo-cache-fallback-key: cargo-rust-${{ inputs.package_path }}
           clippy: true
           rustfmt: true
 
@@ -125,10 +130,10 @@ jobs:
             OPTIONS=""
           fi
 
-          ./scripts/publish-rust.sh ${{ github.event.inputs.package_path }} $LEVEL $OPTIONS
+          ./scripts/publish-rust.sh ${{ inputs.package_path }} $LEVEL $OPTIONS
 
       - name: Create GitHub release
-        if: github.event.inputs.create_release == 'true' && github.event.inputs.dry_run != 'true'
+        if: inputs.create_release == 'true' && inputs.dry_run != 'true'
         uses: ncipollo/release-action@v1
         with:
           tag: ${{ env.TAG_PREFIX }}@v${{ steps.publish.outputs.new_version }}

rust-toolchain.toml

@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.84.1"