From 6f9ac4a8048dbd678819300466462b9a6b118268 Mon Sep 17 00:00:00 2001 From: Bob Aman Date: Tue, 31 Dec 2024 16:04:30 -0600 Subject: [PATCH 1/3] Updates spdx and moves dependency update check to the dependency action. --- .github/workflows/dependencies.yml | 32 +++++++++++++++++++ .github/workflows/rust.yml | 25 --------------- crates/sdk/examples/blank-slate/Cargo.lock | 4 +-- crates/sdk/examples/evil-bit/Cargo.lock | 4 +-- tests/plugins/multi-phase-plugin-a/Cargo.lock | 4 +-- tests/plugins/multi-phase-plugin-b/Cargo.lock | 4 +-- tests/plugins/redis-plugin/Cargo.lock | 4 +-- tests/plugins/smoke-test/Cargo.lock | 4 +-- 8 files changed, 44 insertions(+), 37 deletions(-) diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index ffc1341a..29b018e8 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -15,3 +15,35 @@ jobs: with: command: check command-arguments: all + + up-to-date-plugins: + name: Up-to-date plugins + runs-on: ubuntu-latest + steps: + - name: Ensure plugins are up-to-date + run: | + #!/bin/bash + set -euo pipefail + + PLUGINS=( + "tests/plugins/multi-phase-plugin-a" + "tests/plugins/multi-phase-plugin-b" + "tests/plugins/redis-plugin" + "tests/plugins/smoke-test" + "crates/sdk/examples/evil-bit" + "crates/sdk/examples/blank-slate" + ) + + for plugin in "${PLUGINS[@]}"; do + echo "Updating plugin: $plugin" + ( + cd $plugin + if ! cargo update; then + echo "::error::Failed to update $plugin" + exit 1 + fi + ) + done + + - name: Ensure non-dirty repo + run: git diff --exit-code diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index ed33a5c3..98ae171b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -146,30 +146,5 @@ jobs: - name: Kill Envoy service run: /usr/bin/docker kill envoy - - name: Ensure test plugins are up-to-date - run: | - #!/bin/bash - set -euo pipefail - - PLUGINS=( - "tests/plugins/multi-phase-plugin-a" - "tests/plugins/multi-phase-plugin-b" - "tests/plugins/redis-plugin" - "tests/plugins/smoke-test" - "crates/sdk/examples/evil-bit" - "crates/sdk/examples/blank-slate" - ) - - for plugin in "${PLUGINS[@]}"; do - echo "Updating plugin: $plugin" - ( - cd $plugin - if ! cargo update; then - echo "::error::Failed to update $plugin" - exit 1 - fi - ) - done - - name: Ensure non-dirty repo run: git diff --exit-code diff --git a/crates/sdk/examples/blank-slate/Cargo.lock b/crates/sdk/examples/blank-slate/Cargo.lock index 317923c0..ea2be0c7 100644 --- a/crates/sdk/examples/blank-slate/Cargo.lock +++ b/crates/sdk/examples/blank-slate/Cargo.lock @@ -672,9 +672,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "spdx" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae30cc7bfe3656d60ee99bf6836f472b0c53dddcbf335e253329abb16e535a2" +checksum = "58b69356da67e2fc1f542c71ea7e654a361a79c938e4424392ecf4fa065d2193" dependencies = [ "smallvec", ] diff --git a/crates/sdk/examples/evil-bit/Cargo.lock b/crates/sdk/examples/evil-bit/Cargo.lock index 9afffede..209cd78c 100644 --- a/crates/sdk/examples/evil-bit/Cargo.lock +++ b/crates/sdk/examples/evil-bit/Cargo.lock @@ -672,9 +672,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "spdx" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae30cc7bfe3656d60ee99bf6836f472b0c53dddcbf335e253329abb16e535a2" +checksum = "58b69356da67e2fc1f542c71ea7e654a361a79c938e4424392ecf4fa065d2193" dependencies = [ "smallvec", ] diff --git a/tests/plugins/multi-phase-plugin-a/Cargo.lock b/tests/plugins/multi-phase-plugin-a/Cargo.lock index 897ae9fd..a93011cb 100644 --- a/tests/plugins/multi-phase-plugin-a/Cargo.lock +++ b/tests/plugins/multi-phase-plugin-a/Cargo.lock @@ -672,9 +672,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "spdx" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae30cc7bfe3656d60ee99bf6836f472b0c53dddcbf335e253329abb16e535a2" +checksum = "58b69356da67e2fc1f542c71ea7e654a361a79c938e4424392ecf4fa065d2193" dependencies = [ "smallvec", ] diff --git a/tests/plugins/multi-phase-plugin-b/Cargo.lock b/tests/plugins/multi-phase-plugin-b/Cargo.lock index fd9f3042..58616b8c 100644 --- a/tests/plugins/multi-phase-plugin-b/Cargo.lock +++ b/tests/plugins/multi-phase-plugin-b/Cargo.lock @@ -672,9 +672,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "spdx" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae30cc7bfe3656d60ee99bf6836f472b0c53dddcbf335e253329abb16e535a2" +checksum = "58b69356da67e2fc1f542c71ea7e654a361a79c938e4424392ecf4fa065d2193" dependencies = [ "smallvec", ] diff --git a/tests/plugins/redis-plugin/Cargo.lock b/tests/plugins/redis-plugin/Cargo.lock index 601c6045..d6948ef1 100644 --- a/tests/plugins/redis-plugin/Cargo.lock +++ b/tests/plugins/redis-plugin/Cargo.lock @@ -672,9 +672,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "spdx" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae30cc7bfe3656d60ee99bf6836f472b0c53dddcbf335e253329abb16e535a2" +checksum = "58b69356da67e2fc1f542c71ea7e654a361a79c938e4424392ecf4fa065d2193" dependencies = [ "smallvec", ] diff --git a/tests/plugins/smoke-test/Cargo.lock b/tests/plugins/smoke-test/Cargo.lock index 6845e06b..a8db2739 100644 --- a/tests/plugins/smoke-test/Cargo.lock +++ b/tests/plugins/smoke-test/Cargo.lock @@ -673,9 +673,9 @@ dependencies = [ [[package]] name = "spdx" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae30cc7bfe3656d60ee99bf6836f472b0c53dddcbf335e253329abb16e535a2" +checksum = "58b69356da67e2fc1f542c71ea7e654a361a79c938e4424392ecf4fa065d2193" dependencies = [ "smallvec", ] From 92b30bc24ff6ba83b8fdbb6163f1023a76702bbf Mon Sep 17 00:00:00 2001 From: Bob Aman Date: Tue, 31 Dec 2024 16:07:34 -0600 Subject: [PATCH 2/3] Helps if you check the repo out. --- .github/workflows/dependencies.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index 29b018e8..e5655156 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -20,6 +20,9 @@ jobs: name: Up-to-date plugins runs-on: ubuntu-latest steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Ensure plugins are up-to-date run: | #!/bin/bash From 79d5be957d497533211fa6065633c647216450d7 Mon Sep 17 00:00:00 2001 From: Bob Aman Date: Tue, 31 Dec 2024 16:08:42 -0600 Subject: [PATCH 3/3] Update .github/workflows/dependencies.yml Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- .github/workflows/dependencies.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index e5655156..e672cac1 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -40,7 +40,7 @@ jobs: for plugin in "${PLUGINS[@]}"; do echo "Updating plugin: $plugin" ( - cd $plugin + cd "$plugin" if ! cargo update; then echo "::error::Failed to update $plugin" exit 1