From 9c71f0e482c20d18a798aa6790065bb42559c563 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 17 Jul 2021 23:37:03 +0200
Subject: [PATCH] Fix broken version checkout
---
.gitlab-ci.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa4893f..569d222 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,6 @@ image: quay.io/sheogorath/build-ah-engine
before_script:
- podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- - '[ "$CI_COMMIT_BRANCH" = "$CI_DEFAULT_BRANCH" ] && export VERSION="$DOH_VERSION"'
variables:
# renovate: datasource=github-tags depName=m13253/dns-over-https
@@ -18,7 +17,7 @@ stages:
build:
stage: build
script:
- - podman build --pull --build-arg VERSION -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
+ - podman build --pull --build-arg VERSION="v$DOH_VERSION" -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
- echo "Image \"$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG\" Digest:"
- podman images --format "{{ .Digest }}" "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
- podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
--
GitLab