Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Dec 19, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c34b761
chore: require yq in Makefile
amdprophet Dec 18, 2024
9590164
chore(ci): install yq on windows
amdprophet Dec 19, 2024
2a2e1ef
chore(ci): install yq on windows workflow-test
amdprophet Dec 19, 2024
ff2a96f
Merge branch 'main' into makefile-fixes
rnishtala-sumo Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/workflow-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/workflow-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 5 additions & 0 deletions otelcolbuilder/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Loading