Skip to content

Commit

Permalink
fix(make): make sure github action can check schemas change (#1651)
Browse files Browse the repository at this point in the history
  • Loading branch information
DexterYan authored Oct 16, 2024
1 parent 78ee833 commit 77fd7da
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/build-test-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,10 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- run: make check-schemas
path: github.com/replicatedhq/troubleshoot
- run: |
cd github.com/replicatedhq/troubleshoot
make check-schemas
compile-preflight:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -388,4 +391,4 @@ jobs:
# if the validate-pr-tests job was successful, this job will succeed
- name: succeed if validate-pr-tests job succeeded
if: needs.validate-pr-tests.result == 'success'
run: echo "Validation succeeded"
run: echo "Validation succeeded"
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ generate: controller-gen client-gen
$(CONTROLLER_GEN) \
object:headerFile=./hack/boilerplate.go.txt paths=./pkg/apis/...
$(CLIENT_GEN) \
--output-base=./../../../ \
--output-base=$$(pwd)/../../../ \
--output-package=github.com/replicatedhq/troubleshoot/pkg/client \
--clientset-name troubleshootclientset \
--input-base github.com/replicatedhq/troubleshoot/pkg/apis \
Expand All @@ -147,7 +147,7 @@ openapischema: controller-gen
controller-gen crd +output:dir=./config/crds paths=./pkg/apis/troubleshoot/v1beta2

check-schemas: generate schemas
@if [ -n "$(shell git status --short)" ]; then \
@if [ -n "$$(git status --short)" ]; then \
echo -e "\033[31mThe git repo is dirty :( Ensure all generated files are committed e.g CRD schema files\033[0;m"; \
git status --short; \
exit 1; \
Expand Down

0 comments on commit 77fd7da

Please sign in to comment.