From f050c118bed5f629e45882e48dbf0f59b20047f0 Mon Sep 17 00:00:00 2001
From: Nicolas Pierre <nico.pierre@icloud.com>
Date: Wed, 26 Jul 2023 23:02:18 +0200
Subject: [PATCH] fix: replace deprecated gitlab ci var (#1404)

* fix: replace deprecated gitlab ci var

GitLab 16.x deprecated several variables including CI_BUILD_REF_NAME.
In order to be exhaustive, two variables are replacing it:
CI_COMMIT_BRANCH (prefered) and CI_COMMIT_REF_NAME.

Issue: #1403

* Update src/drivers/gitlab.js

* ci: add expires_at in gitlab credentials

---------

Co-authored-by: Daniel Barnes <dabarnes2b@gmail.com>
---
 .github/workflows/gitlab.yml | 2 +-
 src/drivers/gitlab.js        | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gitlab.yml b/.github/workflows/gitlab.yml
index 56b455fb8..a66e7d61c 100644
--- a/.github/workflows/gitlab.yml
+++ b/.github/workflows/gitlab.yml
@@ -28,7 +28,7 @@ jobs:
           ; user.password = '${{ github.token }}'
           ; user.password_confirmation = '${{ github.token }}'
           ; user.save!
-          ; token = user.personal_access_tokens.create(scopes: [:api], name: 'Token')
+          ; token = user.personal_access_tokens.create(scopes: [:api], name: 'Token', expires_at: 1.days.from_now)
           ; token.set_token('${{ github.token }}')
           ; token.save!
           "
diff --git a/src/drivers/gitlab.js b/src/drivers/gitlab.js
index f5cb6a7df..932964ea6 100644
--- a/src/drivers/gitlab.js
+++ b/src/drivers/gitlab.js
@@ -530,7 +530,10 @@ class Gitlab {
   }
 
   get branch() {
-    return process.env.CI_BUILD_REF_NAME;
+    if ('CI_COMMIT_BRANCH' in process.env) {
+      return process.env.CI_COMMIT_BRANCH;
+    }
+    return process.env.CI_COMMIT_REF_NAME;
   }
 
   get userEmail() {