fix: dist and release (#88)

Azure · May 17, 2020 · 41d6824 · 41d6824
1 parent cfd0f29
commit 41d6824
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -66,12 +66,12 @@ jobs:
 
             The image for this release is `azk8sinfra/k8s-infra-controller:${{ env.RELEASE_VERSION }}`.
       - name: upload manifest
-        id: manifest
+        id: manifest-release-asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./dist/release.yaml
           asset_name: manifest.yaml
-          asset_content_type: application/x-yaml
+          asset_content_type: application/octet-stream
diff --git a/Makefile b/Makefile
@@ -186,17 +186,17 @@ deploy: manifests $(KUBECTL) $(KUSTOMIZE) docker-build docker-push ## Deploy con
 	$(KUSTOMIZE) build config/default | sed "s_${CONFIG_REGISTRY}_${REGISTRY}/${IMG}_" | $(KUBECTL) apply -f -
 
 .PHONY: docker-build
-docker-build: test ## Build the docker image
+docker-build: ## Build the docker image
 	docker build . -t $(REGISTRY)/${IMG}
 
 .PHONY: docker-push
 docker-push: ## Push the docker image
 	docker push $(REGISTRY)/${IMG}
 
 .PHONY: dist
-dist:
+dist: $(KUSTOMIZE)
 	mkdir -p dist
 	$(KUSTOMIZE) build config/default | sed "s_${CONFIG_REGISTRY}_${REGISTRY}/${IMG}_" | > dist/release.yaml
 
 .PHONY: release
-release: dist docker-build docker-push $(KUSTOMIZE) ## Build, push, generate dist for release
+release: dist docker-build docker-push ## Build, push, generate dist for release