From 239fdfbab7bb455b307635ffbabd87c248e458f1 Mon Sep 17 00:00:00 2001 From: Alex Collins Date: Tue, 11 May 2021 09:41:56 -0700 Subject: [PATCH] build: api/util/message --- .github/workflows/release.yml | 3 ++- Makefile | 21 ++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 549e2b7b..82dfe441 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,13 +51,14 @@ jobs: echo "##[set-output name=tag;]$tag" id: tag - name: Generate release artifacts - run: make manifests TAG=${{ github.tag.inputs.tag }} + run: make manifests changelog TAG=${{ github.tag.inputs.tag }} - name: Draft release uses: softprops/action-gh-release@v1 with: tag_name: ${{ github.tag.inputs.tag }} draft: true prerelease: true + body_path: changelog files: | config/*.yaml env: diff --git a/Makefile b/Makefile index 95686322..5e59d894 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ TAG ?= latest CONFIG ?= dev # Produce CRDs that work back to Kubernetes 1.11 (no version conversion) CRD_OPTIONS ?= "crd:trivialVersions=true" -K3D ?= $(shell [ `command -v kubectl` != '' ] && [ `kubectl config current-context` = k3d-k3s-default ] && echo true || echo false) +K3D ?= $(shell [ "`command -v kubectl`" != '' ] && [ `kubectl config current-context` = k3d-k3s-default ] && echo true || echo false) # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) @@ -20,8 +20,7 @@ build: generate manifests go build ./... # Run tests -test: - touch api/util/message +test: api/util/message go test -v ./... -coverprofile cover.out pre-commit: codegen test install lint @@ -96,8 +95,7 @@ api/v1alpha1/generated.%: $(shell find api/v1alpha1 -type f -name '*.go' -not -n mv api/v1alpha1/groupversion_info.go.0 api/v1alpha1/groupversion_info.go go mod tidy -lint: - touch api/util/message +lint: api/util/message go mod tidy golangci-lint run --fix kubectl apply --dry-run=client -f docs/examples @@ -124,8 +122,11 @@ endif scan-%: docker scan --severity=high quay.io/argoproj/dataflow-$*:$(TAG) -$(GOBIN)/controller-gen: - go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1 ;\ +changelog: + git log --oneline -n10 > changelog + +$(GOBIN)/controller-gen: api/util/message + go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1 version:=2.3.2 name:=darwin @@ -148,9 +149,11 @@ config/nats/single-server-nats.yml: config/stan/single-server-stan.yml: curl -o config/stan/single-server-stan.yml https://raw.githubusercontent.com/nats-io/k8s/v0.7.4/nats-streaming-server/single-server-stan.yml -.PHONY: test-examples -test-examples: +api/util/message: touch api/util/message + +.PHONY: test-examples +test-examples: api/util/message go test -timeout 20m -v -tags examples -count 1 ./docs/examples argocli: