From 823707a8817d8ad46248f138aeb136379621403f Mon Sep 17 00:00:00 2001 From: "Heinz N. Gies" Date: Fri, 5 Feb 2021 17:13:27 +0100 Subject: [PATCH 1/2] Ensure Cargo.lock is up to date Signed-off-by: Heinz N. Gies --- .github/checks/vsn.sh | 8 ++++++++ .github/workflows/tests.yml | 2 ++ Cargo.lock | 1 + Makefile | 6 ++++++ 4 files changed, 17 insertions(+) create mode 100755 .github/checks/vsn.sh diff --git a/.github/checks/vsn.sh b/.github/checks/vsn.sh new file mode 100755 index 0000000000..f44faefa62 --- /dev/null +++ b/.github/checks/vsn.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +LOCK_DIFF="$(git diff Cargo.lock | wc -l)" + +if [ "${LOCK_DIFF}" -ne "0" ] +then + echo "Build changed the lock file" + exit 1 +fi \ No newline at end of file diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1a862774da..e4db992864 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,6 +19,8 @@ jobs: profile: minimal - name: Run tests run: cargo test --all + - name: Validate lockfile + run: .github/checks/vsn.sh code-coverage: runs-on: ubuntu-latest steps: diff --git a/Cargo.lock b/Cargo.lock index be3016e01d..674804f701 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +# This file is automatically @generated by Cargo [[package]] name = "addr2line" version = "0.14.1" diff --git a/Makefile b/Makefile index 20d8e5b980..69f70e210d 100644 --- a/Makefile +++ b/Makefile @@ -83,6 +83,12 @@ chk: dep-list: @cargo tree --all | sed -e 's/[^a-z]*\([a-z]\)/\1/' | sort -u +clippy: + touch */src/lib.rs && \ + touch src/lib.rs && \ + touch */src/main.rs && \ + cargo clippy --all + ############################################################################### # eg: builder-image-x86_64-unknown-linux-gnu From dbc00d6d60569b99acda12ce747b1760eefa63ca Mon Sep 17 00:00:00 2001 From: "Heinz N. Gies" Date: Fri, 5 Feb 2021 17:41:22 +0100 Subject: [PATCH 2/2] Lets fail on purpose Signed-off-by: Heinz N. Gies --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index d1c4639b52..90711cd7a0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0" name = "tremor-runtime" readme = "README.md" repository = "https://github.com/tremor-rs/tremor-runtime" -version = "0.9.4" +version = "0.9.3" [workspace]