From d27e8bced8aec61fc80ff6842fdee067559a7a32 Mon Sep 17 00:00:00 2001
From: Penelope Gwen <penelope@pogmom.me>
Date: Tue, 23 Apr 2024 18:11:01 -0600
Subject: [PATCH 01/11] update pipelines

---
 .gitlab-ci.yml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index beb8bb3..32d345f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,10 +5,14 @@ before_script:
 # Defines stages which are to be executed
 stages:
   - build
+  - upload
+  - release
 
 # Stage "build"
 run-build:
   stage: build
+  rules:
+    - if: $VERSION
   script:
     - apt-get -y install rustup libdbus-glib-1-dev
     - rustup default stable
@@ -19,3 +23,32 @@ run-build:
   artifacts:
     paths:
       - build/*
+    untracked: true
+
+upload:
+  stage: upload
+  dependencies:
+    - build
+  rules:
+    - if: $VERSION
+  script:
+    - file=$( find ./build -name "*.deb" | head -n 1 )
+    - export filename=$( basename $file )
+    - package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/gtkgreet/${VERSION}/${filename}"
+    - "curl --header \"JOB-TOKEN: $CI_JOB_TOKEN\" --upload-file \"${file}\" \"${package_url}\""
+
+release:
+  stage: release
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
+  rules:
+    - if: $VERSION
+  script:
+    - echo "making release! ${package_url}"
+  release:
+    tag_name: "batalert ${VERSION} ${CI_RUNNER_EXECUTABLE_ARCH}"
+    description: "batalert ${VERSION} ${CI_RUNNER_EXECUTABLE_ARCH}"
+    assets:
+      links:
+        - name: "${CI_RUNNER_EXECUTABLE_ARCH} deb"
+          url: "$package_url"
+

From 1a9d369cca7b109c09825be4443095f29363e63e Mon Sep 17 00:00:00 2001
From: Penelope Gwen <penelope@pogmom.me>
Date: Tue, 23 Apr 2024 18:11:34 -0600
Subject: [PATCH 02/11] update pipelines

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 32d345f..3393b4a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ stages:
   - release
 
 # Stage "build"
-run-build:
+build:
   stage: build
   rules:
     - if: $VERSION

From d9ca5dd7dda3c295571ba9417a968017647615e0 Mon Sep 17 00:00:00 2001
From: Penelope Gwen <penelope@pogmom.me>
Date: Tue, 23 Apr 2024 18:15:57 -0600
Subject: [PATCH 03/11] update pipelines

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3393b4a..06d05b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,7 +45,7 @@ release:
   script:
     - echo "making release! ${package_url}"
   release:
-    tag_name: "batalert ${VERSION} ${CI_RUNNER_EXECUTABLE_ARCH}"
+    tag_name: "batalert ${VERSION}-${CI_RUNNER_EXECUTABLE_ARCH}"
     description: "batalert ${VERSION} ${CI_RUNNER_EXECUTABLE_ARCH}"
     assets:
       links:

From c4aa55bb158088c0acc8514c935c5317f826e491 Mon Sep 17 00:00:00 2001
From: Penelope Gwen <penelope@pogmom.me>
Date: Tue, 23 Apr 2024 18:20:40 -0600
Subject: [PATCH 04/11] update pipelines

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 06d05b8..f6bcbdc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,7 +45,7 @@ release:
   script:
     - echo "making release! ${package_url}"
   release:
-    tag_name: "batalert ${VERSION}-${CI_RUNNER_EXECUTABLE_ARCH}"
+    tag_name: "${VERSION}-${CI_RUNNER_EXECUTABLE_ARCH#*/}"
     description: "batalert ${VERSION} ${CI_RUNNER_EXECUTABLE_ARCH}"
     assets:
       links:

From 7cb50a53b2b6865bc1f56cf989d8ea76bf3cb010 Mon Sep 17 00:00:00 2001
From: Penelope Gwen <penelope@pogmom.me>
Date: Tue, 23 Apr 2024 18:25:39 -0600
Subject: [PATCH 05/11] update pipelines

---
 .gitlab-ci.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f6bcbdc..23d8417 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,7 +33,7 @@ upload:
     - if: $VERSION
   script:
     - file=$( find ./build -name "*.deb" | head -n 1 )
-    - export filename=$( basename $file )
+    - filename=$( basename $file )
     - package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/gtkgreet/${VERSION}/${filename}"
     - "curl --header \"JOB-TOKEN: $CI_JOB_TOKEN\" --upload-file \"${file}\" \"${package_url}\""
 
@@ -43,9 +43,13 @@ release:
   rules:
     - if: $VERSION
   script:
+    - file=$( find ./build -name "*.deb" | head -n 1 )
+    - filename=$( basename $file )
+    - arch=$( uname -m )
+    - package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/gtkgreet/${VERSION}/${filename}"
     - echo "making release! ${package_url}"
   release:
-    tag_name: "${VERSION}-${CI_RUNNER_EXECUTABLE_ARCH#*/}"
+    tag_name: "${VERSION}-${arch}"
     description: "batalert ${VERSION} ${CI_RUNNER_EXECUTABLE_ARCH}"
     assets:
       links:

From fa9276855ee59162b1d8bab0a1c58b6c251293e6 Mon Sep 17 00:00:00 2001
From: Penelope Gwen <penelope@pogmom.me>
Date: Tue, 23 Apr 2024 18:32:07 -0600
Subject: [PATCH 06/11] update pipelines

---
 .gitlab-ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 23d8417..97b3b1b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,11 +43,11 @@ release:
   rules:
     - if: $VERSION
   script:
-    - file=$( find ./build -name "*.deb" | head -n 1 )
-    - filename=$( basename $file )
-    - arch=$( uname -m )
-    - package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/gtkgreet/${VERSION}/${filename}"
-    - echo "making release! ${package_url}"
+    - export file=$( find ./build -name "*.deb" | head -n 1 )
+    - export filename=$( basename $file )
+    - export arch=$( uname -m )
+    - package_url=${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/gtkgreet/${VERSION}/${filename}
+    - echo making release! ${package_url}
   release:
     tag_name: "${VERSION}-${arch}"
     description: "batalert ${VERSION} ${CI_RUNNER_EXECUTABLE_ARCH}"

From 3aeba46830675b5296b7a18f6b9f15a9d30738b3 Mon Sep 17 00:00:00 2001
From: Penelope Gwen <penelope@pogmom.me>
Date: Tue, 23 Apr 2024 18:33:38 -0600
Subject: [PATCH 07/11] update pipelines

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 97b3b1b..207e2d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,13 +46,13 @@ release:
     - export file=$( find ./build -name "*.deb" | head -n 1 )
     - export filename=$( basename $file )
     - export arch=$( uname -m )
-    - package_url=${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/gtkgreet/${VERSION}/${filename}
+    - export package_url=${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/gtkgreet/${VERSION}/${filename}
     - echo making release! ${package_url}
   release:
     tag_name: "${VERSION}-${arch}"
     description: "batalert ${VERSION} ${CI_RUNNER_EXECUTABLE_ARCH}"
     assets:
       links:
-        - name: "${CI_RUNNER_EXECUTABLE_ARCH} deb"
-          url: "$package_url"
+        - name: "${arch} deb"
+        - url: "${package_url}"
 

From f6c953c62fd1b2d641c8f8efd969fdaccd3a9209 Mon Sep 17 00:00:00 2001
From: Penelope Gwen <penelope@pogmom.me>
Date: Tue, 23 Apr 2024 19:01:12 -0600
Subject: [PATCH 08/11] update pipelines

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 207e2d6..66195fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,5 +54,5 @@ release:
     assets:
       links:
         - name: "${arch} deb"
-        - url: "${package_url}"
+        url: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/gtkgreet/${VERSION}/${filename}"
 

From 7088893a88d811a745229e0f25baf182f1dfbc7a Mon Sep 17 00:00:00 2001
From: Penelope Gwen <penelope@pogmom.me>
Date: Tue, 23 Apr 2024 19:02:06 -0600
Subject: [PATCH 09/11] update pipelines

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 66195fb..e92e7cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,5 +54,5 @@ release:
     assets:
       links:
         - name: "${arch} deb"
-        url: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/gtkgreet/${VERSION}/${filename}"
+          url: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/gtkgreet/${VERSION}/${filename}"
 

From 9fa49ef43573377bbf579887f2912864c31ed28e Mon Sep 17 00:00:00 2001
From: Penelope Gwen <penelope@pogmom.me>
Date: Tue, 23 Apr 2024 19:07:31 -0600
Subject: [PATCH 10/11] update pipelines

---
 .gitlab-ci.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e92e7cf..b90b883 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,11 +48,5 @@ release:
     - export arch=$( uname -m )
     - export package_url=${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/gtkgreet/${VERSION}/${filename}
     - echo making release! ${package_url}
-  release:
-    tag_name: "${VERSION}-${arch}"
-    description: "batalert ${VERSION} ${CI_RUNNER_EXECUTABLE_ARCH}"
-    assets:
-      links:
-        - name: "${arch} deb"
-          url: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/gtkgreet/${VERSION}/${filename}"
+    - release-cli create --name "${arch} Release ${VERSION}" --tag-name "${VERSION}-${arch}" --assets-link '{"name":"Asset1","url":"${package_url}","link_type":"other"}'
 

From d0ea91abf43f0f4d626ba7e47f45b7663043a728 Mon Sep 17 00:00:00 2001
From: Penelope Gwen <penelope@pogmom.me>
Date: Tue, 23 Apr 2024 19:13:16 -0600
Subject: [PATCH 11/11] update pipelines

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b90b883..a681ff4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,5 +48,5 @@ release:
     - export arch=$( uname -m )
     - export package_url=${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/gtkgreet/${VERSION}/${filename}
     - echo making release! ${package_url}
-    - release-cli create --name "${arch} Release ${VERSION}" --tag-name "${VERSION}-${arch}" --assets-link '{"name":"Asset1","url":"${package_url}","link_type":"other"}'
+    - release-cli create --name "${arch} Release ${VERSION}" --tag-name "${VERSION}-${arch}" --assets-link "{\"name\":\"${arch} deb\",\"url\":\"${package_url}\",\"link_type\":\"other\"}"