From ab309ca5127d903833b3dc4c615e3d383a7eb7e2 Mon Sep 17 00:00:00 2001
From: Gerald Pinder <4626052+gmpinder@users.noreply.github.com>
Date: Sun, 23 Jul 2023 13:19:31 -0400
Subject: [PATCH] Fix GITLAB vars

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18f8eec..64d49cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,16 +14,15 @@ default:
       COMMIT_TAGS=()
       BUILD_TAGS=()
       # Have tags for tracking builds during pull request
-      SHA_SHORT="$CI_COMMIT_SHA"
-      COMMIT_TAGS+=("pr-${{ github.event.number }}-${FEDORA_MAJOR_VERSION}")
-      COMMIT_TAGS+=("${SHA_SHORT}-${FEDORA_MAJOR_VERSION}")
+      COMMIT_TAGS+=("pr-${CI_MERGE_REQUEST_IID}-${FEDORA_MAJOR_VERSION}")
+      COMMIT_TAGS+=("${CI_COMMIT_SHORT_SHA}-${FEDORA_MAJOR_VERSION}")
 
       BUILD_TAGS=("${FEDORA_MAJOR_VERSION}" "${FEDORA_MAJOR_VERSION}-${TIMESTAMP}")
 
       BUILD_TAGS+=("${TIMESTAMP}")
       BUILD_TAGS+=("latest")
 
-      if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+      if [[ $CI_PIPELINE_SOURCE == "merge_request_event" ]]; then
           echo "Generated the following commit tags: "
           for TAG in "${COMMIT_TAGS[@]}"; do
               echo "${TAG}"