From 2078362f8e0185b0c54a1fa9af078e1303b9ec01 Mon Sep 17 00:00:00 2001 From: Sergio Ribera Date: Wed, 19 Oct 2022 19:06:21 -0400 Subject: [PATCH 1/9] Generate rust toolchain file --- rust-toolchain.toml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 rust-toolchain.toml diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000000..b843f0c70f --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,3 @@ +[toolchain] +channel = "1.60.0" +profile = "default" From 2a95757e3f6f6240a70ef7003536dfc7389e7f88 Mon Sep 17 00:00:00 2001 From: Sergio Ribera Date: Thu, 20 Oct 2022 09:26:02 -0400 Subject: [PATCH 2/9] Make track "stable" channel --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index b843f0c70f..02cb8fcb53 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.60.0" +channel = "stable" profile = "default" From a97dda4fc8ca2443364d19a4ec4082761cebf8ba Mon Sep 17 00:00:00 2001 From: Sergio Ribera Date: Thu, 20 Oct 2022 11:21:14 -0400 Subject: [PATCH 3/9] Add targets for rust toolchain file --- rust-toolchain.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 02cb8fcb53..d27d303f95 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,9 @@ [toolchain] channel = "stable" profile = "default" +targets = [ + "x86_64-unknown-linux-gnu", + "x86_64-unknown-linux-musl", + "x86_64-apple-darwin", + "x86_64-pc-windows-msvc", +] From 9b78610154a7518d5edf4bb76cc1062db59a4abe Mon Sep 17 00:00:00 2001 From: Sergio Ribera Date: Fri, 21 Oct 2022 00:20:04 -0400 Subject: [PATCH 4/9] Remove unnecesary targets --- rust-toolchain.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index d27d303f95..f10376f21d 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -4,6 +4,4 @@ profile = "default" targets = [ "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", - "x86_64-apple-darwin", - "x86_64-pc-windows-msvc", ] From f5bf7d550b51bfb927efabca9c555372f90529a2 Mon Sep 17 00:00:00 2001 From: Sergio Ribera Date: Fri, 21 Oct 2022 00:32:31 -0400 Subject: [PATCH 5/9] Remove unnecesary targets (gnu) --- rust-toolchain.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index f10376f21d..874c0a0a90 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -2,6 +2,5 @@ channel = "stable" profile = "default" targets = [ - "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", ] From b4478cc4970c6e8560bb0b02f058a372f99994f9 Mon Sep 17 00:00:00 2001 From: Sergio Ribera Date: Fri, 21 Oct 2022 00:50:24 -0400 Subject: [PATCH 6/9] Modify action to ignore rust toolchain file --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0cd7581284..9065b17a88 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,6 +45,7 @@ jobs: with: toolchain: ${{ matrix.rust }} default: true + override: false profile: minimal components: clippy @@ -100,6 +101,7 @@ jobs: toolchain: ${{ matrix.rust }} profile: minimal default: true + override: false target: x86_64-unknown-linux-musl - name: Setup MUSL @@ -127,6 +129,7 @@ jobs: uses: actions-rs/toolchain@v1 with: toolchain: stable + override: false components: rustfmt - run: cargo fmt -- --check @@ -170,4 +173,4 @@ jobs: - uses: actions/upload-artifact@v1 with: name: release-notes.txt - path: ./release-notes.txt \ No newline at end of file + path: ./release-notes.txt From 1f29143264c562355e0ca84f1ead43029581e744 Mon Sep 17 00:00:00 2001 From: Sergio Ribera Date: Fri, 21 Oct 2022 00:50:45 -0400 Subject: [PATCH 7/9] Remove all targets --- rust-toolchain.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 874c0a0a90..02cb8fcb53 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,6 +1,3 @@ [toolchain] channel = "stable" profile = "default" -targets = [ - "x86_64-unknown-linux-musl", -] From 17b3e3852a757de8ec8fd56002709e0bfcd085a7 Mon Sep 17 00:00:00 2001 From: Sergio Ribera Date: Fri, 21 Oct 2022 00:56:48 -0400 Subject: [PATCH 8/9] Set tru as override for workflow --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9065b17a88..6a38b5050d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: with: toolchain: ${{ matrix.rust }} default: true - override: false + override: true profile: minimal components: clippy @@ -101,7 +101,7 @@ jobs: toolchain: ${{ matrix.rust }} profile: minimal default: true - override: false + override: true target: x86_64-unknown-linux-musl - name: Setup MUSL @@ -129,7 +129,7 @@ jobs: uses: actions-rs/toolchain@v1 with: toolchain: stable - override: false + override: true components: rustfmt - run: cargo fmt -- --check From 536fe1403ed1b0733c0b3decda960707d5131137 Mon Sep 17 00:00:00 2001 From: Sergio Ribera Date: Mon, 24 Oct 2022 23:25:20 -0400 Subject: [PATCH 9/9] CD workflow override rust toolchain file --- .github/workflows/cd.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index ce4db2b940..c4c91350be 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -25,6 +25,7 @@ jobs: with: toolchain: stable profile: minimal + override: true components: clippy - name: Build