From ed8fee62cdf6b09e5f93d1d61b0d531c19a709ff Mon Sep 17 00:00:00 2001 From: James Watkins-Harvey Date: Tue, 1 Jul 2025 00:50:54 -0400 Subject: [PATCH 1/2] Update Rust to at least 1.88 --- .github/workflows/dotnet.yaml | 6 ++++++ .github/workflows/typescript.yaml | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yaml b/.github/workflows/dotnet.yaml index bf1a7466..f7c5f6a4 100644 --- a/.github/workflows/dotnet.yaml +++ b/.github/workflows/dotnet.yaml @@ -63,6 +63,7 @@ jobs: path: features repository: ${{ inputs.features-repo-path }} ref: ${{ inputs.features-repo-ref }} + - name: Checkout .NET SDK repo if: ${{ inputs.version-is-repo-ref }} uses: actions/checkout@v4 @@ -81,10 +82,15 @@ jobs: # TODO: Upgrade proto once https://github.com/arduino/setup-protoc/issues/99 is fixed version: '23.x' repo-token: ${{ secrets.GITHUB_TOKEN }} + - uses: actions/setup-go@v5 with: go-version: '^1.21' + - uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.88.0 + - uses: Swatinem/rust-cache@v2 if: ${{ inputs.version-is-repo-ref }} with: diff --git a/.github/workflows/typescript.yaml b/.github/workflows/typescript.yaml index 692c4938..b1f04e50 100644 --- a/.github/workflows/typescript.yaml +++ b/.github/workflows/typescript.yaml @@ -74,7 +74,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 16 + node-version: 18 - name: Install protoc if: ${{ inputs.version-is-repo-ref }} @@ -83,10 +83,15 @@ jobs: # TODO: Upgrade proto once https://github.com/arduino/setup-protoc/issues/99 is fixed version: '23.x' repo-token: ${{ secrets.GITHUB_TOKEN }} + - uses: actions/setup-go@v5 with: go-version: '^1.21' + - uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.88.0 + - uses: Swatinem/rust-cache@v2 if: ${{ inputs.version-is-repo-ref }} with: From 565df968ab7a42ef5a2d1916b79e1ba5d64dc919 Mon Sep 17 00:00:00 2001 From: James Watkins-Harvey Date: Tue, 1 Jul 2025 11:08:43 -0400 Subject: [PATCH 2/2] Just upgrade rust to latest, don't specify exact rust version --- .github/workflows/dotnet.yaml | 2 -- .github/workflows/typescript.yaml | 2 -- 2 files changed, 4 deletions(-) diff --git a/.github/workflows/dotnet.yaml b/.github/workflows/dotnet.yaml index f7c5f6a4..31d08791 100644 --- a/.github/workflows/dotnet.yaml +++ b/.github/workflows/dotnet.yaml @@ -88,8 +88,6 @@ jobs: go-version: '^1.21' - uses: dtolnay/rust-toolchain@stable - with: - toolchain: 1.88.0 - uses: Swatinem/rust-cache@v2 if: ${{ inputs.version-is-repo-ref }} diff --git a/.github/workflows/typescript.yaml b/.github/workflows/typescript.yaml index b1f04e50..1a07df5e 100644 --- a/.github/workflows/typescript.yaml +++ b/.github/workflows/typescript.yaml @@ -89,8 +89,6 @@ jobs: go-version: '^1.21' - uses: dtolnay/rust-toolchain@stable - with: - toolchain: 1.88.0 - uses: Swatinem/rust-cache@v2 if: ${{ inputs.version-is-repo-ref }}