From 84b0be80c7136c041139cfe4574d0a4b330e96e0 Mon Sep 17 00:00:00 2001
From: Ralph Little <skelband@gmail.com>
Date: Sat, 24 May 2025 12:57:32 -0700
Subject: [PATCH] tools: updates for the create_release tool.

---
 .gitlab-ci.yml          |  2 ++
 tools/create-release.sh | 11 ++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e46b92ea3..88e22f3e1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -125,6 +125,8 @@ make-distcheck:
 upload:
   image: alpine
   stage: release
+  needs:
+    - job: make-dist
   before_script:
     - apk --no-cache add curl git jq
   script:
diff --git a/tools/create-release.sh b/tools/create-release.sh
index ddb44cf58..99ef3a5eb 100755
--- a/tools/create-release.sh
+++ b/tools/create-release.sh
@@ -4,9 +4,7 @@
 #
 # License: GPL-3.0+
 
-GROUP=sane-project
-PROJECT=backends
-PROJECT_ID=$GROUP%2F$PROJECT
+PROJECT_ID=$CI_PROJECT_ID
 
 API_ENDPOINT=https://gitlab.com/api/v4
 
@@ -18,17 +16,16 @@ upload () {
          --request POST \
          $API_ENDPOINT/projects/$PROJECT_ID/uploads \
         | jq --raw-output .url \
-        | sed "s|^|https://gitlab.com/$GROUP/$PROJECT|"
+        | sed "s|^|https://gitlab.com/-/project/$PROJECT_ID|"
 }
 
 cat << EOF > release.json
 {
   "name": "SANE Backends $CI_COMMIT_TAG",
   "tag_name": "$CI_COMMIT_TAG",
-  "description": "$(sed '1,3d; //,$d}' NEWS \
+  "description": $(sed '1,9d;/\x0c/,$d' NEWS \
      | git stripspace \
-     | sed 's/"/\\"/g; s/$/\\n/g' \
-     | tr -d '\n')",
+     | jq -Rs),
   "assets": {
     "links": [
 EOF