fix: Makefile targets for release (#19)

renderedtext · Aug 3, 2023 · a17ea42 · a17ea42
1 parent 78cf043
commit a17ea42
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/.semaphore/release.yml b/.semaphore/release.yml
@@ -10,7 +10,8 @@ blocks:
       jobs:
         - name: Execute chart-releaser
           commands:
-            - checkout
+            - git clone $SEMAPHORE_GIT_URL $SEMAPHORE_GIT_DIR
+            - cd $SEMAPHORE_GIT_DIR
             - make cr.install
             - make helm.package
             - make helm.upload

diff --git a/Makefile b/Makefile
@@ -1,9 +1,8 @@
-PKG_LOCAL_DIR=.pkg
 GIT_REPO_OWNER=renderedtext
 GIT_REPO=helm-charts
 
 helm.package:
-	helm package charts/* -d $(PKG_LOCAL_DIR)
+	cr package charts/*
 
 helm.lint:
 	helm lint charts/*
@@ -12,19 +11,17 @@ helm.upload:
 	cr upload \
 		--owner $(GIT_REPO_OWNER) \
 		--git-repo $(GIT_REPO) \
-		--package-path $(PKG_LOCAL_DIR) \
 		--token $$GITHUB_TOKEN \
-		--packages-with-index \
-		--skip-existing \
-		--push
+		--skip-existing
 
 helm.index:
+	git config --global user.email "$$GIT_USER_EMAIL"
+	git config --global user.name "$$GIT_USER_NAME"
+	git remote set-url origin https://github.com/$(GIT_REPO_OWNER)/$(GIT_REPO)
 	cr index \
 		--owner $(GIT_REPO_OWNER) \
 		--git-repo $(GIT_REPO) \
-		--package-path $(PKG_LOCAL_DIR) \
 		--token $$GITHUB_TOKEN \
-		--packages-with-index \
 		--index-path . \
 		--push