From 79e7eac7fceeaa39496f7b6bbbeb0e370434b2a2 Mon Sep 17 00:00:00 2001
From: Joseph Donofry <joedonofry@gmail.com>
Date: Tue, 8 Dec 2020 16:32:04 -0500
Subject: [PATCH] More MacOS CI Updates

---
 .ci/macos/deploy.sh | 6 ++++--
 .gitlab-ci.yml      | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.ci/macos/deploy.sh b/.ci/macos/deploy.sh
index 1dc9472d..7439a06d 100755
--- a/.ci/macos/deploy.sh
+++ b/.ci/macos/deploy.sh
@@ -16,15 +16,17 @@ PATH=/usr/local/opt/qt/bin/:${PATH}
   mkdir -p nheko.app/Contents/Frameworks
   find "${ICU_LIB}" -type l -name "*.dylib" -exec cp -a -n {} nheko.app/Contents/Frameworks/ \; || true
 
-  sudo macdeployqt nheko.app -dmg -always-overwrite -qmldir=../resources/qml/
+  macdeployqt nheko.app -dmg -always-overwrite -qmldir=../resources/qml/
 
   user=$(id -nu)
-  sudo chown "${user}" nheko.dmg
+  chown "${user}" nheko.dmg
   mv nheko.dmg ..
 )
 
 dmgbuild -s ./.ci/macos/settings.json "Nheko" nheko.dmg
 
+VERSION=${CI_COMMIT_SHORT_SHA}
+
 if [ -n "$VERSION" ]; then
     mv nheko.dmg "nheko-${VERSION}.dmg"
     mkdir artifacts
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f7f4085..5ca3d5c7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,7 +54,6 @@ build-macos:
     - brew update
     - brew bundle --file=./.ci/macos/Brewfile
   script:
-    - export VERSION=$(git describe)
     - export PATH=/usr/local/opt/qt/bin/:${PATH}
     - export CMAKE_PREFIX_PATH=/usr/local/opt/qt5
     - cmake -GNinja -H. -Bbuild
@@ -69,11 +68,12 @@ build-macos:
     - cmake --build build
   after_script:
     - ./.ci/macos/deploy.sh
-    - ./.ci/upload-nightly-gitlab.sh artifacts/nheko-${VERSION}.dmg
+    - ./.ci/upload-nightly-gitlab.sh artifacts/nheko-${CI_COMMIT_SHORT_SHA}.dmg
   artifacts:
     paths:
-      - artifacts/nheko-${VERSION}.dmg
-    name: nheko-${CI_COMMIT_REF_NAME}-${VERSION}-macos
+      - artifacts/nheko-${CI_COMMIT_SHORT_SHA}.dmg
+    name: nheko-${CI_COMMIT_SHORT_SHA}-macos
+    expose_as: 'macos-dmg'
   cache:
     key: "${CI_JOB_NAME}"
     paths: