Update-codegen needs a specific path

nginxinc · Dec 14, 2021 · 959091a · 959091a
1 parent 9197648
commit 959091a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -75,6 +75,7 @@ jobs:
           make update-crds && git diff --name-only --exit-code deployments/common/crds* deployments/helm-chart/crds*
       - name: Check if Codegen changed
         run: |
+          sed -i 's,github.com/nginxinc/kubernetes-ingress,runner/work/kubernetes-ingress/kubernetes-ingress,g' ./hack/update-codegen.sh
           make update-codegen && git diff --name-only --exit-code pkg/**/zz_generated.deepcopy.go
 
   binary:

diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -17,10 +17,11 @@
 set -o errexit
 set -o nounset
 set -o pipefail
+set -o xtrace
 
 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'."