From c34b761ebc2ddc4efdae22b2a25541085876d649 Mon Sep 17 00:00:00 2001 From: Justin Kolberg Date: Wed, 18 Dec 2024 15:54:48 -0800 Subject: [PATCH 1/3] chore: require yq in Makefile Signed-off-by: Justin Kolberg --- otelcolbuilder/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/otelcolbuilder/Makefile b/otelcolbuilder/Makefile index 84fbf41af3..c7bf4a3240 100644 --- 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 ?= otel-mac-certs@sumologic.com From 959016447c1caf5d3154f6219bc29c9be96f0dc5 Mon Sep 17 00:00:00 2001 From: Justin Kolberg Date: Wed, 18 Dec 2024 16:04:39 -0800 Subject: [PATCH 2/3] chore(ci): install yq on windows Signed-off-by: Justin Kolberg --- .github/workflows/workflow-build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/workflow-build.yml b/.github/workflows/workflow-build.yml index b0fc3fdf0e..e0d6bc796f 100644 --- 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 From 2a2e1ef59d4adfbe5a0ffa3027cd2676723f14c0 Mon Sep 17 00:00:00 2001 From: Justin Kolberg Date: Wed, 18 Dec 2024 16:28:09 -0800 Subject: [PATCH 3/3] chore(ci): install yq on windows workflow-test Signed-off-by: Justin Kolberg --- .github/workflows/workflow-test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/workflow-test.yml b/.github/workflows/workflow-test.yml index 2e9f6c5cfe..a61514273a 100644 --- 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