From cd6d479d20f8194d7549daa766a9fd352cfe6fc0 Mon Sep 17 00:00:00 2001
From: Ellen Poe <ellen.poe.ext@murena.com>
Date: Thu, 2 Oct 2025 15:55:00 -0700
Subject: [PATCH] ci: use `glab release create` to create a release

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f5cee28..6ba6b98 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -260,41 +260,24 @@ release:
       # Build APKs for each architecture
       ./gradlew assembleArm64Release --info --stacktrace --no-daemon
       ./gradlew assembleX86_64Release --info --stacktrace --no-daemon
-      # Build AABs for each architecture
-      ./gradlew bundleArm64Release bundleX86_64Release --info --stacktrace --no-daemon
+    # Install glab CLI for release creation
+    - cd ..
+    - curl -fsSL https://gitlab.com/gitlab-org/cli/-/releases/permalink/latest/downloads/glab_Linux_x86_64.tar.gz | sudo tar -xz -C /usr/local/bin glab
+    # Create release with glab
+    - |
+      glab release create "$CI_COMMIT_TAG" \
+        --name "Cardinal Maps ${CI_COMMIT_TAG#v}" \
+        --notes "## Cardinal Maps ${CI_COMMIT_TAG#v}
+
+      ### APK Files
+      - \`app-arm64-release.apk\` - For ARM64 devices (most modern Android phones)
+      - \`app-x86_64-release.apk\` - For x86_64 devices (emulators, some tablets)
+
+      Choose the appropriate file for your device architecture. If unsure, try the ARM64 version first as it works on most modern Android devices." \
+        "cardinal-android/app/build/outputs/apk/arm64/release/app-arm64-release.apk#app-arm64-release.apk#package" \
+        "cardinal-android/app/build/outputs/apk/x86_64/release/app-x86_64-release.apk#app-x86_64-release.apk#package"
   artifacts:
     paths:
       - cardinal-android/app/build/outputs/apk/arm64/release/app-arm64-release.apk
       - cardinal-android/app/build/outputs/apk/x86_64/release/app-x86_64-release.apk
     expire_in: 7 days
-  release:
-    tag_name: $CI_COMMIT_TAG
-    name: 'Cardinal Maps ${CI_COMMIT_TAG#v}'
-    description: |
-      ## Cardinal Maps ${CI_COMMIT_TAG#v}
-      
-      This release includes separate builds for different architectures:
-      
-      ### APK Files (for sideloading)
-      - `app-arm64-release.apk` - For ARM64 devices (most modern Android phones)
-      - `app-x86_64-release.apk` - For x86_64 devices (emulators, some tablets)
-      
-      ### AAB Files (for Google Play Store)
-      - `app-arm64-release.aab` - ARM64 Android App Bundle for Google Play
-      - `app-x86_64-release.aab` - x86_64 Android App Bundle for Google Play
-      
-      Choose the appropriate file for your device architecture. If unsure, try the ARM64 version first as it works on most modern Android devices.
-    assets:
-      links:
-        - name: 'app-arm64-release.apk'
-          url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/file/cardinal-android/app/build/outputs/apk/arm64/release/app-arm64-release.apk'
-          link_type: 'package'
-        - name: 'app-x86_64-release.apk'
-          url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/file/cardinal-android/app/build/outputs/apk/x86_64/release/app-x86_64-release.apk'
-          link_type: 'package'
-        - name: 'app-arm64-release.aab'
-          url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/file/cardinal-android/app/build/outputs/bundle/arm64Release/app-arm64-release.aab'
-          link_type: 'package'
-        - name: 'app-x86_64-release.aab'
-          url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/file/cardinal-android/app/build/outputs/bundle/x86_64Release/app-x86_64-release.aab'
-          link_type: 'package'
-- 
GitLab