Skip to content

Commit

Permalink
Fix pipeline;
Browse files Browse the repository at this point in the history
  • Loading branch information
joergdw committed Oct 2, 2023
1 parent 6bc5caa commit c438fe1
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 12 deletions.
24 changes: 15 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@ SHELL := /bin/bash
.SHELLFLAGS := -eu -o pipefail -c ${SHELLFLAGS}
MAKEFLAGS = -s

go_modules := $(shell find . -maxdepth 3 -name "*.mod" -exec dirname {} \; | sed 's|\./src/||' | sort)
go-acceptance-dir := ./src/acceptance
go-autoscaler-dir := ./src/autoscaler
go-changelog-dir := ./src/changelog
go-changeloglockcleander-dir := ./src/changeloglockcleaner
go-test-app-dir := ./src/acceptance/assets/app/go_app

go_modules := $(shell find . -maxdepth 3 -name "*.mod" -exec dirname {} \; | sed 's|\./src/||' | sort)
all_modules := $(go_modules) db scheduler

MVN_OPTS = "-Dmaven.test.skip=true"
Expand All @@ -23,7 +29,8 @@ CI ?= false
VERSION ?= 0.0.testing
DEST ?= build

GOLANGCI_LINT_VERSION = v$(shell cat .tool-versions | grep golangci-lint | cut --delimiter=' ' --fields='2')
GOLANGCI_LINT_VERSION = v$(shell cat .tool-versions | grep golangci-lint \
| cut --delimiter=' ' --fields='2')

export BUILDIN_MODE ?= false
export DEBUG ?= false
Expand Down Expand Up @@ -257,18 +264,17 @@ acceptance-release: clean-acceptance go-mod-tidy vendor build-test-app
@mkdir -p ${DEST}
@tar --create --auto-compress --directory="src" --file="${ACCEPTANCE_TESTS_FILE}" 'acceptance'


.PHONY: generate-fakes autoscaler.generate-fakes test-app.generate-fakes
generate-fakes: autoscaler.generate-fakes test-app.generate-fakes
autoscaler.generate-fakes:
make --directory='${go-autoscaler-dir}' generate-fakes
test-app.generate-fakes:
make --directory='${go-test-app-dir}' generate-fakes

.PHONY: go-mod-tidy
go-mod-tidy: acceptance.go-mod-tidy autoscaler.go-mod-tidy changelog.go-mod-tidy \
changeloglockcleander.go-mod-tidy test-app.go-mod-tidy

go-acceptance-dir := ./src/acceptance
go-autoscaler-dir := ./src/autoscaler
go-changelog-dir := ./src/changelog
go-changeloglockcleander-dir := ./src/changeloglockcleaner
go-test-app-dir := ./src/acceptance/assets/app/go_app

.PHONY: acceptance.go-mod-tidy autoscaler.go-mod-tidy changelog.go-mod-tidy \
changeloglockcleander.go-mod-tidy test-app.go-mod-tidy
acceptance.go-mod-tidy:
Expand Down
3 changes: 2 additions & 1 deletion ci/autoscaler/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,8 @@ jobs:
- task: make-prerelease
file: ci/ci/autoscaler/tasks/make/make.yaml
params:
TARGETS: go-mod-tidy vendor db scheduler
# ⚠️ Here it is used that make officially guarantees to reach the goals in the provided order.
TARGETS: generate-fakes go-mod-tidy go-mod-vendor db scheduler
- task: deploy-autoscaler
file: ci/ci/autoscaler/tasks/deploy-autoscaler.yml
params:
Expand Down
4 changes: 2 additions & 2 deletions ci/autoscaler/tasks/make/make.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# shellcheck disable=SC2086
set -euo pipefail
set -eu -o pipefail

make -C $1 ${TARGETS}
make --directory="${1}" ${TARGETS}

0 comments on commit c438fe1

Please sign in to comment.