CI: Fix release CI

- Also remove redundant files and put pushing upload to run only for
  main branch

Signed-off-by: Ayush Singh <ayush@beagleboard.org>

.gitlab-ci.yml

@@ -138,13 +138,17 @@ darwin:
       - release/
 
 include:
-  - component: openbeagle.org/ayush1325/ci-components/package-registry-upload@f978eab991610929089e1f7acc2954723dda9173
+  - component: openbeagle.org/ayush1325/ci-components/package-registry-upload@e35d87728f404b409451702a1f23b92453142812
+    rules:
+      - if: $CI_DEFAULT_BRANCH == $CI_COMMIT_BRANCH
+      - if: $CI_COMMIT_TAG
+    rules:
     inputs:
       job-name: package-registry-upload-job
       job-stage: deploy
       job-needs: ["darwin", "windows", "linux_x86_64", "linux_aarch64", "linux_arm"]
       release_dir: ${CI_PROJECT_DIR}/release
-  - component: openbeagle.org/ayush1325/ci-components/release-from-file@f978eab991610929089e1f7acc2954723dda9173
+  - component: openbeagle.org/ayush1325/ci-components/release-from-file@e35d87728f404b409451702a1f23b92453142812
     rules:
       - if: $CI_COMMIT_TAG
     inputs:

Makefile

@@ -25,7 +25,6 @@ SERVICE_ASSETS = $(CURDIR)/bb-imager-service/assets
 include bb-imager-gui/Makefile
 include bb-imager-cli/Makefile
 include bb-imager-service/Makefile
-include scripts/*.mk
 
 clean:
 	$(CARGO_PATH) clean

bb-imager-service/Makefile

 PACKAGE_NAME_SERVICE = bb-imager-service
-RELEASE_DIR_SERVICE = ${RELEASE_DIR}/${PACKAGE_NAME_SERVICE}/${PACKAGE_VERSION}
+RELEASE_DIR_SERVICE = ${RELEASE_DIR}/${PACKAGE_NAME_SERVICE}/${VERSION}
 
 build-service-%:
 	$(info "Building D-Bus Service for $*")

scripts/release.mk

-# Helpers for creating Gitlab Releases
-CURL ?= $(shell which curl)
-
-release-notes:
-	$(info "Generate release notes for $VERSION")
-	curl -H "PRIVATE-TOKEN: ${CI_API_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/repository/changelog?version=${VERSION}" | jq -r .notes > release_notes.md