From: Yann Dirson <yann.dirson@vates.fr>
Date: Thu, 14 Dec 2023 14:10:02 +0000 (+0100)
Subject: ci: fix apk-add invocation
X-Git-Tag: 0.3.0~3^2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a99ee5d34fc429a8c619eb3c0c204a754cec1739;p=xen-guest-agent.git

ci: fix apk-add invocation

Really fixes breakage from e651f8fae5c49bb1301a9b38fb047eba78d941dc.

So much for trusting search results on CLI syntax :/

Signed-off-by: Yann Dirson <yann.dirson@vates.fr>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6742ec3..07d9761 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -91,10 +91,13 @@ env-setup:
   stage: setup
   image: alpine:latest
   before_script:
-    - '[ "$CI_COMMIT_BRANCH" != "main" ] || apk add -y git'
+    - |
+      if [ "$CI_COMMIT_REF_NAME" = "main" ]; then
+          apk add git
+      fi
   script:
     - |
-      case "$CI_COMMIT_BRANCH" in
+      case "$CI_COMMIT_REF_NAME" in
       main) UPSTREAMVERSION=$(git describe)
             TILDEVERSION=$UPSTREAMVERSION
             ;;