fix Makefiles after rebase

Author: estroz

.goreleaser.yml

@@ -18,11 +18,11 @@ builds:
     main: ./cmd/operator-sdk
     binary: operator-sdk
     mod_timestamp: "{{ .CommitTimestamp }}"
-    asmflags:
+    asmflags: &build-asmflags
       - all=-trimpath={{ .Env.PWD }}
-    gcflags:
+    gcflags: &build-gcflags
       - all=-trimpath={{ .Env.PWD }}
-    ldflags:
+    ldflags: &build-ldflags
       - -X {{ .Env.REPO }}/internal/version.Version={{ .Env.SIMPLE_VERSION }}
       - -X {{ .Env.REPO }}/internal/version.GitVersion={{ .Env.GIT_VERSION }}
       - -X {{ .Env.REPO }}/internal/version.GitCommit={{ .Env.GIT_COMMIT }}
@@ -39,31 +39,19 @@ builds:
     main: ./cmd/ansible-operator
     binary: ansible-operator
     mod_timestamp: "{{ .CommitTimestamp }}"
-    asmflags:
-      - all=-trimpath={{ .Env.PWD }}
-    gcflags:
-      - all=-trimpath={{ .Env.PWD }}
-    ldflags:
-      - -X {{ .Env.REPO }}/internal/version.Version={{ .Env.SIMPLE_VERSION }}
-      - -X {{ .Env.REPO }}/internal/version.GitVersion={{ .Env.GIT_VERSION }}
-      - -X {{ .Env.REPO }}/internal/version.GitCommit={{ .Env.GIT_COMMIT }}
-      - -X {{ .Env.REPO }}/internal/version.KubernetesVersion={{ .Env.K8S_VERSION }}
+    asmflags: *build-asmflags
+    gcflags: *build-gcflags
+    ldflags: *build-ldflags
     targets: *build-targets
 
   # helm-operator build steps
   - id: helm-operator
     main: ./cmd/helm-operator
     binary: helm-operator
     mod_timestamp: "{{ .CommitTimestamp }}"
-    asmflags:
-      - all=-trimpath={{ .Env.PWD }}
-    gcflags:
-      - all=-trimpath={{ .Env.PWD }}
-    ldflags:
-      - -X {{ .Env.REPO }}/internal/version.Version={{ .Env.SIMPLE_VERSION }}
-      - -X {{ .Env.REPO }}/internal/version.GitVersion={{ .Env.GIT_VERSION }}
-      - -X {{ .Env.REPO }}/internal/version.GitCommit={{ .Env.GIT_COMMIT }}
-      - -X {{ .Env.REPO }}/internal/version.KubernetesVersion={{ .Env.K8S_VERSION }}
+    asmflags: *build-asmflags
+    gcflags: *build-gcflags
+    ldflags: *build-ldflags
     targets: *build-targets
 
 # Use most recent tag and short commit for snapshot version.
@@ -80,10 +68,10 @@ checksum:
 
 # Sign checksum files with the local default PGP key.
 # TODO(estroz): configure CI PGP key
-signs:
-  - signature: "${artifact}.asc"
-    cmd: gpg2
-    artifacts: checksum
+# signs:
+#   - signature: "${artifact}.asc"
+#     cmd: gpg2
+#     artifacts: checksum
 
 # We use a custom changelog generator.
 changelog:

.travis.yml

@@ -159,4 +159,4 @@ jobs:
     - stage: release
       name: publish release
       before_install: git fetch origin --unshallow --tags
-      script: make -f release/Makefile release TAG="$TRAVIS_TAG"
+      script: make release

Makefile

@@ -67,8 +67,6 @@ build/scorecard-test build/scorecard-test-kuttl build/custom-scorecard-tests:
 build/operator-sdk build/ansible-operator build/helm-operator:
 	go build $(GO_BUILD_ARGS) -o $(BUILD_DIR)/$(@F) ./cmd/$(@F)
 
-##@ Dev images
-
 # Convenience wrapper for building all remotely hosted images.
 .PHONY: image-build
 IMAGE_TARGET_LIST = operator-sdk helm-operator ansible-operator scorecard-test scorecard-test-kuttl
@@ -84,6 +82,20 @@ image/%: build/%
 	docker build -t $(BUILD_IMAGE_REPO)/$*:dev -f ./images/$*/Dockerfile ./images/$*
 	rm -rf $(BUILD_DIR)
 
+##@ Release
+
+.PHONY: release
+release: ## Release the operator-sdk project
+	$(MAKE) -f release/Makefile release
+
+.PHONY: tag
+tag: ## Create a release tag
+	$(MAKE) -f release/Makefile tag
+
+.PHONY: prerelease
+prerelease: ## Pre-release changes to commit prior to releasing the operator-sdk project
+	$(MAKE) -f release/Makefile prerelease
+
 ##@ Test
 
 .PHONY: test-all
@@ -149,14 +161,6 @@ test-e2e-integration:: ## Run integration tests
 	./hack/tests/integration.sh
 	./hack/tests/subcommand-olm-install.sh
 
-.PHONY: release
-release: ## Release the operator-sdk project
-	$(MAKE) -f release/Makefile release
-
-.PHONY: prerelease
-prerelease: ## Pre-release changes to commit prior to releasing the operator-sdk project
-	$(MAKE) -f release/Makefile prerelease
-
 .DEFAULT_GOAL := help
 .PHONY: help
 help: ## Show this help screen.

netlify.toml

@@ -8,7 +8,7 @@
   command = """
 git submodule update -f --init themes/docsy && \
 npm install postcss-cli autoprefixer@^9.0.0 && \
-./set_version.sh && \
+./scripts/set_version.sh && \
 hugo version && \
 hugo
 """

release.sh

@@ -20,7 +20,7 @@ endif
 .PHONY: check_git_version
 check_git_version:
 ifeq (,$(GIT_VERSION))
-	$(error "GIT_VERSION must be set to a release tag")
+	$(error "GIT_VERSION must be set to a git tag")
 endif
 
 .PHONY: check_k8s_version
@@ -29,22 +29,25 @@ ifeq (,$(K8S_VERSION))
 	$(error "K8S_VERSION must be set to a Kubernetes release version")
 endif
 
-.PHONY: all
-all: release
-
 .PHONY: release
 release: check_git_version check_k8s_version ## Release all operator-sdk binaries with notes. $GIT_VERSION must be explicitly set to avoid ambiguity.
 	$(SCRIPTS_DIR)/fetch goreleaser
 	GORELEASER_CURRENT_TAG=$(GIT_VERSION) K8S_VERSION=$(K8S_VERSION) $(TOOLS_DIR)/goreleaser $(SNAPSHOT_FLAGS) --release-notes=changelog/generated/$(GIT_VERSION).md --parallelism 5
 
+.PHONY: check_release_version
+check_release_version:
+ifeq (,$(RELEASE_VERSION))
+	$(error "RELEASE_VERSION must be set to a release tag")
+endif
+
 .PHONY: prerelease
-prerelease: check_git_version changelog
+prerelease: check_release_version changelog
 	./website/scripts/update_mappings.sh $(RELEASE_VERSION)
 
 .PHONY: changelog
-changelog: check_git_version ## Generate the changelog.
-	@mkdir -p changelog/generated && rm -f changelog/generated/$(GIT_VERSION).md
-	go run ./release/changelog/gen-changelog.go -tag=$(GIT_VERSION) -changelog=changelog/generated/$(GIT_VERSION).md
+changelog: check_release_version ## Generate the changelog.
+	@mkdir -p changelog/generated && rm -f changelog/generated/$(RELEASE_VERSION).md
+	go run ./release/changelog/gen-changelog.go -tag=$(RELEASE_VERSION) -changelog=changelog/generated/$(RELEASE_VERSION).md
 	rm -f ./changelog/fragments/!(00-template.yaml)
 
 .PHONY: tag
@@ -59,15 +62,6 @@ endif
 	git tag --sign --message "Operator SDK $(RELEASE_VERSION)" $(RELEASE_VERSION)
 	git verify-tag --verbose $(RELEASE_VERSION)
 
-.PHONY: release
-K8S_VERSION = v1.18.2
-release: check_tag goreleaser ## Release all operator-sdk binaries with notes. $TAG must be explicitly set to avoid ambiguity.
-	GORELEASER_CURRENT_TAG=$(TAG) K8S_VERSION=$(K8S_VERSION) ./bin/goreleaser $(SNAPSHOT_FLAGS) --release-notes=changelog/generated/$(TAG).md --parallelism 5
-
-.PHONY: goreleaser
-goreleaser: ## Install goreleaser locally.
-	@[[ -f ./bin/goreleaser ]] || curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | sh
-
 # Convenience wrappers for pushing all remotely hosted images.
 .PHONY: image-push image-push-multiarch
 IMAGE_TARGET_LIST = operator-sdk helm-operator ansible-operator scorecard-test scorecard-test-kuttl

release/Makefile

@@ -63,7 +63,7 @@ git checkout -b release-v1.3.0
 Run the pre-release `make` target:
 
 ```sh
-make -f release/Makefile prerelease RELEASE_VERSION=v1.3.0
+make prerelease RELEASE_VERSION=v1.3.0
 ```
 
 The following changes should be present:
@@ -93,7 +93,7 @@ See [this section](#locking-down-branches) for steps to do so.
 ### 5. Create and push a release tag
 
 ```sh
-make -f release/Makefile tag RELEASE_VERSION=v1.3.0
+make tag RELEASE_VERSION=v1.3.0
 git push upstream v1.3.0
 ```
 
@@ -145,10 +145,10 @@ git checkout -b release-v1.3.1
 Run the pre-release `make` target:
 
 ```sh
-make -f release/Makefile prerelease RELEASE_VERSION=v1.3.1
+make prerelease RELEASE_VERSION=v1.3.1
 ```
 
-The following changes should have been made:
+The following changes should be present:
 
 - `changelog/generated/v1.3.0.md`: commit changes (created by changelog generation).
 - `changelog/fragments/*`: commit deleted fragment files (deleted by changelog generation).
@@ -173,7 +173,7 @@ See [this section](#locking-down-branches) for steps to do so.
 ### 5. Create and push a release tag
 
 ```sh
-make -f release/Makefile tag RELEASE_VERSION=v1.3.1
+make tag RELEASE_VERSION=v1.3.1
 git push upstream v1.3.1
 ```