From 489bbabc25242bd39118747c1216e598e1ef6a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Kejser=20Jensen?= Date: Mon, 24 Aug 2026 16:26:47 +0200 Subject: [PATCH 1/4] Use Rust 1.97.1 to compile on Windows --- docs/user/README.md | 2 +- rust-toolchain.toml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 rust-toolchain.toml diff --git a/docs/user/README.md b/docs/user/README.md index e2d5bdce..a0533d61 100644 --- a/docs/user/README.md +++ b/docs/user/README.md @@ -37,7 +37,7 @@ The following commands are for Ubuntu Server. However, equivalent commands shoul ### All -2. Install the latest stable [Rust Toolchain](https://rustup.rs/). +2. Install Rust 1.97.1 [Rust Toolchain](https://rustup.rs/). 3. Clone the repository: `git clone https://github.com/ModelarData/ModelarDB-RS` 4. Build, test, and run the system using Cargo: - Debug Build: `cargo build` diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 00000000..22a15b44 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +channel = "1.97.1" +components = ["clippy"] +profile = "minimal" \ No newline at end of file From 27d718289e5d38d7f5bf2b1ae79a851691e9f313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Kejser=20Jensen?= Date: Mon, 24 Aug 2026 16:55:32 +0200 Subject: [PATCH 2/4] Update based on comments from @Copilot --- docs/user/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/user/README.md b/docs/user/README.md index a0533d61..86758553 100644 --- a/docs/user/README.md +++ b/docs/user/README.md @@ -37,7 +37,8 @@ The following commands are for Ubuntu Server. However, equivalent commands shoul ### All -2. Install Rust 1.97.1 [Rust Toolchain](https://rustup.rs/). +2. Install version 1.97.1 of the [Rust Toolchain](https://rustup.rs/). + - If your use `rustup` it will automatically install the correct toolchain when you run `cargo` commands. 3. Clone the repository: `git clone https://github.com/ModelarData/ModelarDB-RS` 4. Build, test, and run the system using Cargo: - Debug Build: `cargo build` From 8f03e55f59bf57153b45e957cc4241a959a78322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Kejser=20Jensen?= Date: Mon, 24 Aug 2026 16:56:27 +0200 Subject: [PATCH 3/4] Remove rustup update as Rust version in now pinned --- .github/workflows/build-lint-test-and-upload.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-lint-test-and-upload.yml b/.github/workflows/build-lint-test-and-upload.yml index 03f908e7..99388cdd 100644 --- a/.github/workflows/build-lint-test-and-upload.yml +++ b/.github/workflows/build-lint-test-and-upload.yml @@ -78,8 +78,6 @@ jobs: az storage container create -n modelardb --connection-string 'DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;QueueEndpoint=http://127.0.0.1:10001/devstoreaccount1;' # Update Rust. - - name: Rustup Update - run: rustup update - name: Rustup Add llvm-tools run: rustup component add llvm-tools-preview - name: Cargo Install grcov From 3ede9e00ead9076c8a9f07113794513b6d8dc858 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Kejser=20Jensen?= Date: Tue, 25 Aug 2026 09:16:48 +0200 Subject: [PATCH 4/4] Update based on comments from @CGodiksen --- .github/workflows/build-lint-test-and-upload.yml | 8 +------- rust-toolchain.toml | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-lint-test-and-upload.yml b/.github/workflows/build-lint-test-and-upload.yml index 99388cdd..b4f40512 100644 --- a/.github/workflows/build-lint-test-and-upload.yml +++ b/.github/workflows/build-lint-test-and-upload.yml @@ -77,9 +77,7 @@ jobs: sleep 5 # Ensure azurite has fully finished creating the endpoint. az storage container create -n modelardb --connection-string 'DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;QueueEndpoint=http://127.0.0.1:10001/devstoreaccount1;' - # Update Rust. - - name: Rustup Add llvm-tools - run: rustup component add llvm-tools-preview + # Install Cargo Tools. - name: Cargo Install grcov run: cargo install grcov - name: Cargo Install machete @@ -142,10 +140,6 @@ jobs: - name: Checkout uses: actions/checkout@v4 - # Update Rust. - - name: Rustup Update - run: rustup update - # Build Rust Binaries. - name: Cargo Build Binaries run: cargo build --release --jobs 1 --verbose # --jobs 1 reduce resource use. diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 22a15b44..7a9b2b65 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] channel = "1.97.1" -components = ["clippy"] +components = ["clippy", "llvm-tools-preview"] profile = "minimal" \ No newline at end of file