From f42deda3e29b240fc73e6b1753a51b39eb1adf5d Mon Sep 17 00:00:00 2001
From: Kwoth <master.kwoth@gmail.com>
Date: Tue, 14 Jun 2022 11:21:18 +0200
Subject: [PATCH] Updated .gitlab-ci.yml. Fixed tags in Nadeko.Medusa and
 docker images

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7cd988409..84d4bd219 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -104,7 +104,7 @@ publish-medusa-package:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   script:
     - LAST_TAG=$(git describe --tags --abbrev=0)
-    - if [ $CI_COMMIT_TAG ];then MEDUSA_VERSION="$CI_COMMIT_TAG"; else MEDUSA_VERSION="$LAST_TAG-$CI_COMMIT_REF_SLUG"; fi
+    - if [ $CI_COMMIT_TAG ];then MEDUSA_VERSION="$CI_COMMIT_TAG"; else MEDUSA_VERSION="$LAST_TAG-$CI_COMMIT_SHA"; fi
     - cd src/Nadeko.Medusa/
     - dotnet pack -c Release /p:Version=$MEDUSA_VERSION -o bin/Release/packed
     - dotnet nuget push bin/Release/packed/ --source https://www.myget.org/F/nadeko/api/v2/package --api-key "$MYGET_API_KEY" 
@@ -125,7 +125,7 @@ docker-build:
         tag=""
         echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
       else
-        tag=":$CI_COMMIT_REF_SLUG"
+        tag=":$CI_COMMIT_SHA"
         echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
       fi
     - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" .