From 8f3ab416aee49bb2fa4d959ffbbc5b0c3a78c555 Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Fri, 5 Jan 2024 11:19:18 +0000
Subject: [PATCH] ci: Remove creation of release, only publish packages

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2698>
---
 .gitlab-ci.yml                                   | 13 +++++--------
 Makefile                                         |  2 +-
 scripts/{ci-release.sh => ci-upload-packages.sh} | 16 ----------------
 3 files changed, 6 insertions(+), 25 deletions(-)
 rename scripts/{ci-release.sh => ci-upload-packages.sh} (77%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0bbe20280..06e119958 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -510,7 +510,7 @@ docker:
     paths:
       - metadata.json
 
-release:
+package:
   stage: publish
   needs:
     - job: build_metadata
@@ -519,6 +519,8 @@ release:
       artifacts: true
     - job: build_front
       artifacts: true
+  rules:
+    - if: $CI_COMMIT_BRANCH =~ /(stable|develop)/
 
   image: $CI_REGISTRY/funkwhale/ci/python:3.11
   variables:
@@ -526,11 +528,6 @@ release:
   before_script:
     - apt-get update
     - apt-get install -y zip
-    - >
-      curl "https://gitlab.com/api/v4/projects/gitlab-org%2Frelease-cli/packages/generic/release-cli/latest/release-cli-linux-amd64"
-      --output /usr/local/bin/release-cli
-    - chmod +x /usr/local/bin/release-cli
-    - release-cli -v
   script:
-    - make build
-    - scripts/ci-release.sh
+    - make package
+    - scripts/ci-upload-packages.sh
diff --git a/Makefile b/Makefile
index fcc1d995b..e5c386632 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ build-metadata:
 
 VERSION ?= $(shell git describe --tags --abbrev=0)
 BUILD_DIR = dist
-build:
+package:
 	rm -Rf $(BUILD_DIR)
 	mkdir -p $(BUILD_DIR)
 	tar --create --gunzip --file='$(BUILD_DIR)/funkwhale-api-$(VERSION).tar.gz' \
diff --git a/scripts/ci-release.sh b/scripts/ci-upload-packages.sh
similarity index 77%
rename from scripts/ci-release.sh
rename to scripts/ci-upload-packages.sh
index ab1a20025..6476c69e3 100755
--- a/scripts/ci-release.sh
+++ b/scripts/ci-upload-packages.sh
@@ -51,25 +51,9 @@ release_json() {
   printf '{"name": "%s", "tag_name": "%s", "assets": { "links": [%s]}}' "$PACKAGE_VERSION" "$PACKAGE_VERSION" "$1"
 }
 
-# publish_release <release_json>
-publish_release() {
-  echo "publishing release $PACKAGE_VERSION"
-  curl \
-    --fail \
-    --show-error \
-    --request POST \
-    --header "Content-Type: application/json" \
-    --header "PRIVATE-TOKEN: $CI_JOB_TOKEN" \
-    --data "$1" \
-    "$CI_API_V4_URL/projects/$CI_PROJECT_ID/releases"
-  echo
-}
-
 release_assets=()
 for asset_path in dist/*; do
   asset="$(basename "$asset_path")"
   publish_asset "$asset" "$asset_path"
   release_assets+=("$(release_asset_json "$asset")")
 done
-
-publish_release "$(release_json "$(join_by , "${release_assets[@]}")")"