feat: use makefile instead

infinyon · Nov 13, 2023 · 9e3e843 · 9e3e843
1 parent ef723c3
commit 9e3e843
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -77,17 +77,10 @@ jobs:
 
       - name: Publish artifacts
         env:
+          BPKG_TOKEN: ${{ secrets.BPKG_TOKEN }}
           FLUVIO_BIN: ~/.fluvio/bin/fluvio
         run: make publish-artifacts-dev
 
-      - name: Publish PackageSet
-        env:
-          BPKG_TOKEN: ${{ secrets.BPKG_TOKEN }}
-          FLUVIO_VERSION: "0.10.17"
-          FLUVIO_CLOUD_VERSION: "0.2.15"
-        run: |
-          ./actions/publish-pkgset.sh
-
       - name: Slack Notification
         uses: 8398a7/action-slack@v3
         if: failure()

diff --git a/actions/publish-pkgset.sh b/actions/publish-pkgset.sh
@@ -27,6 +27,6 @@ curl -v -X "POST" "https://hub.infinyon.cloud/hub/v1/fvm/pkgset" \
       "version": "$FLUVIO_VERSION"
     }
   ],
-  "pkgset": "$FLUVIO_VERSION"
+  "pkgset": "$PKGSET_NAME"
 }
 EOF
diff --git a/makefiles/release.mk b/makefiles/release.mk
@@ -171,7 +171,7 @@ publish-artifacts: install-fluvio-package unzip-gh-release-artifacts
 			$$ARTIFACT; \
 	)
 
-publish-artifacts: PUBLIC_VERSION=$(subst -$(GIT_COMMIT_SHA),+$(GIT_COMMIT_SHA),$(VERSION))
+publish-artifacts-hub: PUBLIC_VERSION=$(subst -$(GIT_COMMIT_SHA),+$(GIT_COMMIT_SHA),$(VERSION))
 publish-artifacts-hub: unzip-gh-release-artifacts
 	@echo "Publish to hub"
 	$(foreach bin, $(PUBLISH_BINARIES_HUB), \
@@ -184,6 +184,10 @@ publish-artifacts-hub: unzip-gh-release-artifacts
 			$(DRY_RUN_ECHO) actions/upload-bpkg.sh $$ARTIFACT $$TARGET ${CHANNEL}; \
 		) \
 	)
+	export PKGSET_NAME=$(CHANNEL)
+	export FLUVIO_VERSION=$(PUBLIC_VERSION)
+	export FLUVIO_CLOUD_VERSION="0.2.15"
+	./actions/publish-pkgset.sh
 
 publish-artifacts-dev-hub: CHANNEL=latest
 publish-artifacts-dev-hub: publish-artifacts-hub