From d59aaa45a560ed52c29b2421ef6d11b3bde8e3f7 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Thu, 4 Apr 2024 16:18:09 -0400 Subject: [PATCH 1/3] fix: udeps build --- .github/workflows/ci-check-app.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- docs/ci-check-app.md | 5 +++-- docs/ci.md | 3 ++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-check-app.yml b/.github/workflows/ci-check-app.yml index 9f38e53..2cb806d 100644 --- a/.github/workflows/ci-check-app.yml +++ b/.github/workflows/ci-check-app.yml @@ -18,11 +18,11 @@ on: rust-toolchain-formatting: description: 'The Rust version to use to check formatting' type: string - default: 'nightly' + default: 'stable' rust-toolchain-udeps: description: 'The Rust version to use to run udeps' type: string - default: 'nightly-2024-02-04' + default: 'stable' rust-backtrace: description: 'The Rust backtrace settings' type: string diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50a5840..2e6c754 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,11 +26,11 @@ on: rust-toolchain-formatting: description: 'The Rust version to use to check formatting' type: string - default: 'nightly' + default: 'stable' rust-toolchain-udeps: description: 'The Rust version to use to run udeps' type: string - default: 'nightly-2024-02-04' + default: 'stable' rust-backtrace: description: 'The Rust backtrace settings' type: string diff --git a/docs/ci-check-app.md b/docs/ci-check-app.md index 91efe8e..bf9aac3 100644 --- a/docs/ci-check-app.md +++ b/docs/ci-check-app.md @@ -27,8 +27,9 @@ graph LR | name | type | description | default | |-----------------------------|-----------|--------------------------------------------------|-------------------------------| | `test-args` | `string` | The arguments to pass to the test command | `--all-features --lib --bins` | -| `rust-toolchain` | `string` | The Rust version to use. | `stable` | -| `rust-toolchain-formatting` | `string` | The Rust version to use to check formatting | `nightly` | +| `rust-toolchain` | `string` | The Rust version to use | `stable` | +| `rust-toolchain-formatting` | `string` | The Rust version to use to check formatting | `stable` | +| `rust-toolchain-udeps` | `string` | The Rust version to use to run udeps | `stable` | | `rust-backtrace` | `string` | The Rust backtrace settings | `full` | | `install-protoc` | `boolean` | Install `protoc` before running the rust tests. | `true` | | `use-sccache` | `boolean` | Install `sccache` before running the rust tests. | `true` | diff --git a/docs/ci.md b/docs/ci.md index cc4d512..e7bd898 100644 --- a/docs/ci.md +++ b/docs/ci.md @@ -28,7 +28,8 @@ graph LR | `check-infra` | `boolean` | Check and plan the infrastructure | `true` | | `check-app` | `boolean` | Check the application code | `true` | | `rust-version` | `string` | The Rust version to use. | `${{ vars.RUST_VERSION }}` | -| `rust-formatting-version` | `string` | The Rust version to use to check formatting. | `nightly` | +| `rust-formatting-version` | `string` | The Rust version to use to check formatting. | `stable` +| `rust-formatting-udeps` | `string` | The Rust version to use to run udeps. | `stable` | | `rust-protoc` | `boolean` | Install `protoc` before running the rust tests. | `true` | | `rust-sccache` | `boolean` | Install `sccache` before running the rust tests. | `true` | | `version` | `string` | The version to use in the Terraform `iamge_version` variable. | `latest` | From b07593b4be0c6668ef81cb0535dce5bcf8702f98 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Thu, 4 Apr 2024 16:20:09 -0400 Subject: [PATCH 2/3] fix: use nightly --- .github/workflows/ci-check-app.yml | 2 +- .github/workflows/ci.yml | 2 +- docs/ci-check-app.md | 2 +- docs/ci.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-check-app.yml b/.github/workflows/ci-check-app.yml index 2cb806d..26bc658 100644 --- a/.github/workflows/ci-check-app.yml +++ b/.github/workflows/ci-check-app.yml @@ -22,7 +22,7 @@ on: rust-toolchain-udeps: description: 'The Rust version to use to run udeps' type: string - default: 'stable' + default: 'nightly' rust-backtrace: description: 'The Rust backtrace settings' type: string diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e6c754..e241f00 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ on: rust-toolchain-udeps: description: 'The Rust version to use to run udeps' type: string - default: 'stable' + default: 'nightly' rust-backtrace: description: 'The Rust backtrace settings' type: string diff --git a/docs/ci-check-app.md b/docs/ci-check-app.md index bf9aac3..6d01300 100644 --- a/docs/ci-check-app.md +++ b/docs/ci-check-app.md @@ -29,7 +29,7 @@ graph LR | `test-args` | `string` | The arguments to pass to the test command | `--all-features --lib --bins` | | `rust-toolchain` | `string` | The Rust version to use | `stable` | | `rust-toolchain-formatting` | `string` | The Rust version to use to check formatting | `stable` | -| `rust-toolchain-udeps` | `string` | The Rust version to use to run udeps | `stable` | +| `rust-toolchain-udeps` | `string` | The Rust version to use to run udeps | `nightly` | | `rust-backtrace` | `string` | The Rust backtrace settings | `full` | | `install-protoc` | `boolean` | Install `protoc` before running the rust tests. | `true` | | `use-sccache` | `boolean` | Install `sccache` before running the rust tests. | `true` | diff --git a/docs/ci.md b/docs/ci.md index e7bd898..2012f50 100644 --- a/docs/ci.md +++ b/docs/ci.md @@ -29,7 +29,7 @@ graph LR | `check-app` | `boolean` | Check the application code | `true` | | `rust-version` | `string` | The Rust version to use. | `${{ vars.RUST_VERSION }}` | | `rust-formatting-version` | `string` | The Rust version to use to check formatting. | `stable` -| `rust-formatting-udeps` | `string` | The Rust version to use to run udeps. | `stable` | +| `rust-formatting-udeps` | `string` | The Rust version to use to run udeps. | `nightly` | | `rust-protoc` | `boolean` | Install `protoc` before running the rust tests. | `true` | | `rust-sccache` | `boolean` | Install `sccache` before running the rust tests. | `true` | | `version` | `string` | The version to use in the Terraform `iamge_version` variable. | `latest` | From 7b70fee868a45ea27ae955560524da752f7b29fe Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Thu, 4 Apr 2024 16:46:52 -0400 Subject: [PATCH 3/3] chore: fix spacing --- docs/ci.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/ci.md b/docs/ci.md index 2012f50..b9f79a5 100644 --- a/docs/ci.md +++ b/docs/ci.md @@ -28,8 +28,8 @@ graph LR | `check-infra` | `boolean` | Check and plan the infrastructure | `true` | | `check-app` | `boolean` | Check the application code | `true` | | `rust-version` | `string` | The Rust version to use. | `${{ vars.RUST_VERSION }}` | -| `rust-formatting-version` | `string` | The Rust version to use to check formatting. | `stable` -| `rust-formatting-udeps` | `string` | The Rust version to use to run udeps. | `nightly` | +| `rust-formatting-version` | `string` | The Rust version to use to check formatting. | `stable` | +| `rust-formatting-udeps` | `string` | The Rust version to use to run udeps. | `nightly` | | `rust-protoc` | `boolean` | Install `protoc` before running the rust tests. | `true` | | `rust-sccache` | `boolean` | Install `sccache` before running the rust tests. | `true` | | `version` | `string` | The version to use in the Terraform `iamge_version` variable. | `latest` |