From 6cb438440d514f190e2d239b19264c7cfa8df50f Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Wed, 26 Aug 2020 12:20:19 +0200 Subject: [PATCH] build: detect current version from kustomize This allows controller components to be updated when they are not included as a Go Mod dependency, which is currently the case for the notification-controller. --- .github/workflows/update.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 5e26bf89..c7dfd147 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -18,18 +18,15 @@ jobs: bump_version() { local RELEASE_VERSION=$(curl -s https://api.github.com/repos/fluxcd/$1/releases | jq -r 'sort_by(.published_at) | .[-1] | .tag_name') - local CURRENT_VERSION=$(go list -m all | grep "github.com/fluxcd/$1/api" | awk '{print $2}') + local CURRENT_VERSION=$(sed -n "s/\(.*$1\/.*?ref=\)//p;n" "manifests/bases/$1/kustomization.yaml") if [[ "${RELEASE_VERSION}" != "${CURRENT_VERSION}" ]]; then - # bump go mod - go mod edit -require="github.com/fluxcd/$1/api@${RELEASE_VERSION}" - # bump kustomize sed -i "s/\($1\/.*?ref=\).*/\1${RELEASE_VERSION}/g" "manifests/bases/$1/kustomization.yaml" - # bump doc var - if [[ $2 ]]; then - sed -i "s/\($2:\s*.{{\s*'\)\(v[0-9.]\+\)\('\s*}}\)/\1${RELEASE_VERSION}\3/" .github/workflows/docs.yaml + if [[ ! -z $(go list -m all | grep "github.com/fluxcd/$1/api" | awk '{print $2}') ]]; then + # bump go mod + go mod edit -require="github.com/fluxcd/$1/api@${RELEASE_VERSION}" fi PR_BODY="$PR_BODY- $1 to ${RELEASE_VERSION}%0A" @@ -38,9 +35,10 @@ jobs: { # bump controller versions - bump_version helm-controller HELM_VER - bump_version kustomize-controller KUSTOMIZE_VER - bump_version source-controller SOURCE_VER + bump_version helm-controller + bump_version kustomize-controller + bump_version source-controller + bump_version notification-controller # add missing and remove unused modules go mod tidy