Require yq in Makefile, install yq on Windows CI runners (#1720)

* chore: require yq in Makefile Signed-off-by: Justin Kolberg <[email protected]> * chore(ci): install yq on windows Signed-off-by: Justin Kolberg <[email protected]> * chore(ci): install yq on windows workflow-test Signed-off-by: Justin Kolberg <[email protected]> --------- Signed-off-by: Justin Kolberg <[email protected]> Co-authored-by: Raj Nishtala <[email protected]>
SumoLogic · Dec 19, 2024 · 5e81667 · 5e81667
1 parent b495cd8
commit 5e81667
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/.github/workflows/workflow-build.yml b/.github/workflows/workflow-build.yml
@@ -123,6 +123,10 @@ jobs:
           restore-keys: |
             ${{ steps.get-cache-key.outputs.restore-keys }}
 
+      - name: Install yq (Windows)
+        if: contains(inputs.arch_os, 'windows')
+        run: choco install yq
+
       - name: Set default BUILDER_BIN_PATH
         run: echo "BUILDER_BIN_PATH=${HOME}/bin" >> $GITHUB_ENV
 

diff --git a/.github/workflows/workflow-test.yml b/.github/workflows/workflow-test.yml
@@ -65,6 +65,10 @@ jobs:
           restore-keys: |
             ${{ steps.get-cache-key.outputs.restore-keys }}
 
+      - name: Install yq (Windows)
+        if: contains(inputs.arch_os, 'windows')
+        run: choco install yq
+
       - name: Set default BUILDER_BIN_PATH
         run: echo "BUILDER_BIN_PATH=${HOME}/bin" >> $GITHUB_ENV
 

diff --git a/otelcolbuilder/Makefile b/otelcolbuilder/Makefile
@@ -24,6 +24,11 @@ BUILDER_BIN_PATH ?= $(HOME)/bin
 
 INSTALLED_BUILDER_VERSION := $(shell $(BUILDER_BIN_NAME) version 2>&1)
 
+INSTALLED_YQ_VERSION := $(shell yq --version 2>&1)
+ifeq ($(INSTALLED_YQ_VERSION),)
+    $(error "The yq command is required but was not found")
+endif
+
 # Settings for macOS builds
 ifeq ($(OS),darwin)
 	AC_USERNAME ?= [email protected]