🧹 Use own yq installation (#2558)

* 🧹 Use own yq installation * Add the GOFLAGS in yq goinstall Co-authored-by: David Simansky <dsimansk@redhat.com> * Call yq using go-run command --------- Co-authored-by: David Simansky <dsimansk@redhat.com>
openshift-knative · Mar 13, 2024 · c9dcd9f · c9dcd9f
1 parent 19b784c
commit c9dcd9f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 38 deletions.
diff --git a/.github/workflows/bump.yaml b/.github/workflows/bump.yaml
@@ -24,14 +24,6 @@ jobs:
         with:
           go-version: 1.21.x
 
-      - name: Install prerequisites
-        env:
-          YQ_VERSION: 3.4.0
-        run: |
-          sudo wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 -O /usr/bin/yq
-          sudo chmod +x /usr/bin/yq
-          sudo mv /usr/bin/yq /usr/local/bin/yq
-
       - name: Checkout openshift-knative/serverless-operator
         uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/dependabot-deps.yaml b/.github/workflows/dependabot-deps.yaml
@@ -24,14 +24,6 @@ jobs:
         with:
           go-version: 1.21.x
 
-      - name: Install prerequisites
-        env:
-          YQ_VERSION: 3.4.0
-        run: |
-          sudo wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 -O /usr/bin/yq
-          sudo chmod +x /usr/bin/yq
-          sudo mv /usr/bin/yq /usr/local/bin/yq
-
       - name: Run ./hack/update-deps.sh
         working-directory: ./src/github.com/${{ github.repository }}
         run: ./hack/update-deps.sh

diff --git a/.github/workflows/release-generate-ci.yaml b/.github/workflows/release-generate-ci.yaml
@@ -24,15 +24,6 @@ jobs:
         with:
           go-version: 1.21.x
 
-      - name: Install prerequisites
-        env:
-          YQ_VERSION: 3.4.0
-        run: |
-          sudo wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 -O /usr/bin/yq
-          sudo chmod +x /usr/bin/yq
-          sudo mv /usr/bin/yq /usr/local/bin/yq
-
-
       - name: Checkout openshift-knative/serverless-operator
         uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml
@@ -26,14 +26,6 @@ jobs:
         with:
           go-version: 1.21.x
 
-      - name: Install prerequisites
-        env:
-          YQ_VERSION: 3.4.0
-        run: |
-          sudo wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 -O /usr/bin/yq
-          sudo chmod +x /usr/bin/yq
-          sudo mv /usr/bin/yq /usr/local/bin/yq
-
       - name: Checkout
         uses: actions/checkout@v4
         with:
@@ -110,8 +102,8 @@ jobs:
         working-directory: ./src/github.com/${{ github.repository }}
         run: |
           csv="olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml"
-          if [[ "$(yq read "$csv" spec.replaces)" == "" || \
-                "$(yq read "$csv" 'metadata.annotations."olm.skipRange"')" == "" ]]; then
+          if [[ "$(GOFLAGS='' go run github.com/mikefarah/yq/v3@latest read "$csv" spec.replaces)" == "" || \
+                "$(GOFLAGS='' go run github.com/mikefarah/yq/v3@latest read "$csv" 'metadata.annotations."olm.skipRange"')" == "" ]]; then
             echo '::error:: Missing spec.replaces or metadata.annotations."olm.skipRange" in CSV.'
             exit 34
           fi

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ For the scripts in this repository to work properly, the following requirements
 build images from code)
 - `bash` (4.0.0 or newer)
 - `make`
-- `yq` (3.4.0)
+- `helm`
 
 ## Install an unreleased version
 

diff --git a/hack/lib/metadata.bash b/hack/lib/metadata.bash
@@ -1,7 +1,16 @@
 #!/usr/bin/env bash
 
-# Make sure yq is on PATH.
-yq > /dev/null || exit 127
+function yq() {
+  local thisfile rootdir bindir
+  thisfile=$(realpath "${BASH_SOURCE[0]}")
+  rootdir=$(dirname "$(dirname "$(dirname "${thisfile}")")")
+  bindir="${rootdir}/_output/bin"
+  if [[ ! -f "${bindir}/yq" ]]; then
+    mkdir -p "${bindir}"
+    GOBIN="${bindir}" GOFLAGS='' go install github.com/mikefarah/yq/v3@latest
+  fi
+  "${bindir}/yq" "$@"
+}
 
 #######################################
 # Gets a value from a metadata file