Update-codegen needs a specific path

nginxinc · Dec 14, 2021 · 2fdb997 · 2fdb997
1 parent 9197648
commit 2fdb997
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,6 +50,8 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
+        with:
+          path: github.com/nginxinc/
       - name: Cache Go controller tools
         uses: actions/cache@v2
         with:
@@ -70,12 +72,20 @@ jobs:
       - name: Determine GOPATH
         id: go
         run: echo "::set-output name=go_path::$(go env GOPATH)"
+      - run: |
+          pwd && ls -lrt
+          mv github.com ../../
+          pwd && ls -lrt
       - name: Check if CRDs changed
         run: |
+          pwd && ls -lrt
           make update-crds && git diff --name-only --exit-code deployments/common/crds* deployments/helm-chart/crds*
+        working-directory: /home/runner/work/github.com/nginxinc/kubernetes-ingress
       - name: Check if Codegen changed
         run: |
+          # cd .. && mkdir -p github.com/nginxinc && mv kubernetes-ingress github.com/nginxinc/ && mv github.com .. && cd ../github.com/nginxinc/kubernetes-ingress
           make update-codegen && git diff --name-only --exit-code pkg/**/zz_generated.deepcopy.go
+        working-directory: /home/runner/work/github.com/nginxinc/kubernetes-ingress
 
   binary:
     name: Build binary

diff --git a/Makefile b/Makefile
@@ -49,7 +49,7 @@ update-codegen: ## Generate code
 .PHONY: update-crds
 update-crds: ## Update CRDs
 	go run sigs.k8s.io/controller-tools/cmd/controller-gen crd:crdVersions=v1 schemapatch:manifests=./deployments/common/crds/ paths=./pkg/apis/configuration/... output:dir=./deployments/common/crds
-	@cp -Rp deployments/common/crds/ deployments/helm-chart/crds
+	@cp -Rp deployments/common/crds/* deployments/helm-chart/crds/
 
 .PHONY: certificate-and-key
 certificate-and-key: ## Create default cert and key

diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -20,7 +20,7 @@ set -o pipefail
 
 SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 CODEGEN_VERSION=$(grep 'k8s.io/code-generator' go.sum | awk '{print $2}' | sed 's/\/go.mod//g' | tail -1)
-CODEGEN_PKG=$(echo `go env GOPATH`"/pkg/mod/k8s.io/code-generator@${CODEGEN_VERSION}")
+CODEGEN_PKG=$(echo $(go env GOPATH)"/pkg/mod/k8s.io/code-generator@${CODEGEN_VERSION}")
 
 if [[ ! -d ${CODEGEN_PKG} ]]; then
   echo "${CODEGEN_PKG} is missing. Running 'go mod download'."