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'}} 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 ``` 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"] diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index e5c13c707..6bff838aa 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -243,7 +243,7 @@ RoninDojo - + Citadel 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