Skip to content

Commit

Permalink
ci: add test for uncommitted changes in deploy directory
Browse files Browse the repository at this point in the history
added test for uncommitted changes in deploy directory under go-test GH action.
Also, created a new make target named `make check-deploy-committed` that
can be used to verify the uncommitted changes.

Signed-off-by: Nikhil-Ladha <nikhilladha1999@gmail.com>
(cherry picked from commit 71cbf3d)

# Conflicts:
#	.github/workflows/go-test.yaml
  • Loading branch information
Nikhil-Ladha authored and mergify[bot] committed Aug 13, 2024
1 parent 41fe80d commit 88a5a67
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 0 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/go-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,32 @@ permissions:
contents: read

jobs:
<<<<<<< HEAD
=======
uncommitted-code-check:
name: uncommitted-code-check
runs-on: ubuntu-latest
steps:
- name: Checkout the repo
uses: actions/checkout@v4

- name: Check generated deploy code
run: make generate-deploy

- name: Check for uncommitted changes
run: make check-all-committed

- name: Show the uncommitted "git diff"
if: ${{ failure() }}
run: git diff ; false
e2e-build-test:
name: e2e-build-test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: e2e-build-test
run: make containerized-build TARGET=e2e.test
>>>>>>> 71cbf3d7e (ci: add test for uncommitted changes in deploy directory)
go-test:
name: go-test
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ queue_rules:
- "status-success=golangci-lint"
- "status-success=mod-check"
- "status-success=lint-extras"
- "status-success=uncommitted-code-check"
- "status-success=ci/centos/k8s-e2e-external-storage/1.27"
- "status-success=ci/centos/k8s-e2e-external-storage/1.28"
- "status-success=ci/centos/k8s-e2e-external-storage/1.29"
Expand Down Expand Up @@ -75,6 +76,7 @@ queue_rules:
- "status-success=golangci-lint"
- "status-success=mod-check"
- "status-success=lint-extras"
- "status-success=uncommitted-code-check"
- "status-success=ci/centos/k8s-e2e-external-storage/1.27"
- "status-success=ci/centos/k8s-e2e-external-storage/1.28"
- "status-success=ci/centos/k8s-e2e-external-storage/1.29"
Expand Down Expand Up @@ -190,6 +192,7 @@ pull_request_rules:
- "status-success=lint-extras"
- "status-success=mod-check"
- "status-success=multi-arch-build"
- "status-success=uncommitted-code-check"
- "status-success=ci/centos/k8s-e2e-external-storage/1.27"
- "status-success=ci/centos/k8s-e2e-external-storage/1.28"
- "status-success=ci/centos/k8s-e2e-external-storage/1.29"
Expand Down Expand Up @@ -280,6 +283,7 @@ pull_request_rules:
- "status-success=mod-check"
- "status-success=lint-extras"
- "#changes-requested-reviews-by=0"
- "status-success=uncommitted-code-check"
- "status-success=ci/centos/k8s-e2e-external-storage/1.27"
- "status-success=ci/centos/k8s-e2e-external-storage/1.28"
- "status-success=ci/centos/k8s-e2e-external-storage/1.29"
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@ generate-deploy:
go mod vendor
$(MAKE) -C deploy

.PHONY: check-all-committed
check-all-committed: ## Fail in case there are uncommitted changes
test -z "$(shell git status --short)" || (echo "files were modified: " ; git status --short ; false)

#
# e2e testing by compiling e2e.test in case it does not exist and running the
# executable. The e2e.test executable is not checked as a dependency in the
Expand Down

0 comments on commit 88a5a67

Please sign in to comment.