From 6250f34bef41f17b91b456b031c758bf84cedd25 Mon Sep 17 00:00:00 2001 From: Joseph Sirianni Date: Tue, 7 Nov 2023 11:43:06 -0500 Subject: [PATCH] Setup actions (#31) * Remove needs * fix script * remove linter --- .github/workflows/ci.yml | 21 --------------------- scripts/test/generic_unix.sh | 6 +++--- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7ad3a5..03908dc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,8 +23,6 @@ jobs: go-test: runs-on: "ubuntu-22.04" - needs: - - setup-environment steps: - name: Check out source code uses: actions/checkout@v4 @@ -38,27 +36,8 @@ jobs: - run: make test - go-lint: - runs-on: "ubuntu-22.04" - needs: - - setup-environment - steps: - - name: Check out source code - uses: actions/checkout@v4 - with: - ref: ${{ github.event.pull_request.head.sha }} - - - name: Set up Go - uses: actions/setup-go@v4.1.0 - with: - go-version: "1.21.3" - - - run: make lint - build: runs-on: "ubuntu-22.04" - needs: - - setup-environment steps: - name: Check out source code uses: actions/checkout@v4 diff --git a/scripts/test/generic_unix.sh b/scripts/test/generic_unix.sh index 21a4cef..aa890e0 100755 --- a/scripts/test/generic_unix.sh +++ b/scripts/test/generic_unix.sh @@ -2,16 +2,16 @@ ./disk-usage -t 1 OUT=$(jq .alerted /tmp/suppress | jq length) -if [[ "$OUT" -eq 0 ]]; then +if [ "$OUT" -eq 0 ]; then echo "expected state to not be empty" exit 1 fi ./disk-usage -t 99 OUT=$(jq .alerted /tmp/suppress | jq length) -if [[ ! "$OUT" -eq 0 ]]; then +if [ "$OUT" -eq 0 ]; then echo "expected state to be empty" - exit 1 + exit 1 fi exit 0