fix: Improve robustness of releases. Fixes #3004 #3009
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alexec
commented
May 12, 2020
| @@ -233,7 +233,7 @@ jobs: | |||
| - yarn-packages-v3-{{ checksum "ui/yarn.lock" }} | |||
| - run: | |||
| name: Download dependencies | |||
| command: yarn --cwd ui install --frozen-lockfile --ignore-optional --non-interactive | |||
There was a problem hiding this comment.
we make these the default options in the .yarnrc
alexec
commented
May 12, 2020
| @@ -78,7 +71,7 @@ CONTROLLER_IMAGE_FILE := dist/controller-image.$(VERSION) | |||
| STATIC_BUILD ?= true | |||
| CI ?= false | |||
| DB ?= postgres | |||
| K3D := $(shell if [ "`kubectl config current-context`" = "k3s-default" ]; then echo true; else echo false; fi) | |||
| K3D := $(shell if [ `which kubectl` <> '' ] && [ "`kubectl config current-context`" = "k3s-default" ]; then echo true; else echo false; fi) | |||
There was a problem hiding this comment.
removes annoying kubectl not found warning
alexec
commented
May 12, 2020
| @@ -127,7 +120,7 @@ endef | |||
| define docker_build | |||
| # If we're making a dev build, we build this locally (this will be faster due to existing Go build caches). | |||
| if [ $(DEV_IMAGE) = true ]; then $(MAKE) dist/$(2)-$(OUTPUT_IMAGE_OS)-$(OUTPUT_IMAGE_ARCH) && mv dist/$(2)-$(OUTPUT_IMAGE_OS)-$(OUTPUT_IMAGE_ARCH) $(2); fi | |||
| docker build $(DOCKER_BUILD_OPTS) -t $(IMAGE_NAMESPACE)/$(1):$(VERSION) --target $(1) -f $(DOCKERFILE) --build-arg IMAGE_OS=$(OUTPUT_IMAGE_OS) --build-arg IMAGE_ARCH=$(OUTPUT_IMAGE_ARCH) . | |||
| docker build --progress plain $(DOCKER_BUILD_OPTS) -t $(IMAGE_NAMESPACE)/$(1):$(VERSION) --target $(1) -f $(DOCKERFILE) --build-arg IMAGE_OS=$(OUTPUT_IMAGE_OS) --build-arg IMAGE_ARCH=$(OUTPUT_IMAGE_ARCH) . | |||
There was a problem hiding this comment.
"plain" shows more info and made issues easier to diagnose
alexec
commented
May 12, 2020
| @@ -167,8 +160,9 @@ else | |||
| endif | |||
|
|
|||
| $(HOME)/go/bin/staticfiles: | |||
| # Install the "staticfiles" tool | |||
| $(call backup_go_mod) | |||
There was a problem hiding this comment.
this is what was making builds "dirty"
alexec
commented
May 12, 2020
| @@ -16,7 +16,27 @@ To generate new manifests and perform basic checks: | |||
|
|
|||
| Publish the images and local Git changes (disabling K3D as this is faster and more reliable for releases): | |||
|
|
|||
| make publish-release K3D=false | |||
| make publish-release K3D=false VERSION=v2.7.2 | |||
There was a problem hiding this comment.
double check the version here
|
Kudos, SonarCloud Quality Gate passed!
|
alexec
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist:
"fix(controller): Updates such and such. Fixes #1234".Fixes #3004
v2.8.0 had no less than three problems:
I believe this all stems from the v2.8.0 tag having been applied to an old commit. Either way, we (I) should have a checklist to prevent these problems.
Additionally, what should be clean builds show
dirty. In the past this has been things like file permissions. I'd like to understand why this is.