From b9c151f549f33a6d5e0b0d210961f36faff53fe3 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Mon, 21 Aug 2023 17:47:58 +0900 Subject: [PATCH 1/4] Update rust-toolchain --- rust-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain b/rust-toolchain index 6c623f78c..58e4eb6b2 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.70 \ No newline at end of file +1.63 From b595002c253dc8d1ab8f7f0c3483c23e5f4d790f Mon Sep 17 00:00:00 2001 From: junderw Date: Mon, 21 Aug 2023 10:01:40 -0700 Subject: [PATCH 2/4] Revert "Add a missing `[workspace]` tag in rust-gbt Cargo to build in git" This reverts commit fadc46f3b5a9a61ece9f9872e8de74b7a77c1f19. --- backend/rust-gbt/Cargo.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/backend/rust-gbt/Cargo.toml b/backend/rust-gbt/Cargo.toml index 790dd6214..09fde52e2 100644 --- a/backend/rust-gbt/Cargo.toml +++ b/backend/rust-gbt/Cargo.toml @@ -6,8 +6,6 @@ authors = ["mononaut"] edition = "2021" publish = false -[workspace] - [lib] crate-type = ["cdylib"] From 88c0d04c18d61df0e48a63d9ba6d94031f625e11 Mon Sep 17 00:00:00 2001 From: junderw Date: Mon, 21 Aug 2023 10:17:35 -0700 Subject: [PATCH 3/4] Match CI toolchain with rust-toolchain --- .github/workflows/ci.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b99454097..35b8d0011 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,8 +27,17 @@ jobs: node-version: ${{ matrix.node }} registry-url: "https://registry.npmjs.org" - - name: Install 1.63.x Rust toolchain - uses: dtolnay/rust-toolchain@1.63 + - name: Read rust-toolchain file from repository + id: gettoolchain + run: echo "::set-output name=toolchain::$(cat rust-toolchain)" + working-directory: ${{ matrix.node }}/${{ matrix.flavor }} + + - name: Install ${{ steps.gettoolchain.outputs.toolchain }} Rust toolchain + # Latest version available on this commit is 1.71.1 + # Commit date is Aug 3, 2023 + uses: dtolnay/rust-toolchain@f361669954a8ecfc00a3443f35f9ac8e610ffc06 + with: + toolchain: ${{ steps.gettoolchain.outputs.toolchain }} - name: Install if: ${{ matrix.flavor == 'dev'}} From 18eb6600b0157446ecead0529fab6a02ac00543b Mon Sep 17 00:00:00 2001 From: junderw Date: Mon, 21 Aug 2023 11:15:47 -0700 Subject: [PATCH 4/4] Fix README to include workaround for legacy versions of npm --- backend/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/README.md b/backend/README.md index 6a0cb821c..e5d9dabdd 100644 --- a/backend/README.md +++ b/backend/README.md @@ -85,7 +85,7 @@ Install dependencies with `npm` and build the backend: ``` cd backend -npm install +npm install --no-install-links # npm@9.4.2 and later can omit the --no-install-links npm run build ```