From a22b56edbeef93d2ad33f3dab55405d09b2f3183 Mon Sep 17 00:00:00 2001
From: Oscar Krause <oscar.krause@collinwebdesigns.de>
Date: Mon, 20 Mar 2023 10:09:50 +0100
Subject: [PATCH] fixes

---
 .PKGBUILD/PKGBUILD | 3 ++-
 .gitlab-ci.yml     | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.PKGBUILD/PKGBUILD b/.PKGBUILD/PKGBUILD
index 82d038d..3913360 100644
--- a/.PKGBUILD/PKGBUILD
+++ b/.PKGBUILD/PKGBUILD
@@ -22,8 +22,9 @@ sha256sums=('SKIP'
             '3dc60140c08122a8ec0e7fa7f0937eb8c1288058890ba09478420fc30ce9e30c')
 
 pkgver() {
+  echo -e "VERSION=$VERSION\nCOMMIT=$CI_COMMIT_SHA" > $srcdir/$pkgname/version.env
   source $srcdir/$pkgname/version.env
-  echo ${VERSION}
+  echo $VERSION
 }
 
 check() {
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7cf0208..395f4fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,12 +43,14 @@ build:apt:
       changes:
         - app/**/*
         - .DEBIAN/**/*
+        - .gitlab-ci.yml
       variables:
         VERSION: "0.0.1"
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       variables:
         VERSION: "0.0.1"
   before_script:
+    - echo $VERSION
     - echo -e "VERSION=$VERSION\nCOMMIT=$CI_COMMIT_SHA" > version.env
     # install build dependencies
     - apt-get update -qq && apt-get install -qq -y build-essential
@@ -71,7 +73,7 @@ build:apt:
     - cd build/
   script:
     # set version based on value in "$CI_BUILD_REF_NAME"
-    - sed -i -E 's/(Version\:\s)0.0/\1'"$CI_BUILD_REF_NAME"'/g' DEBIAN/control
+    - sed -i -E 's/(Version\:\s)0.0/\1'"$VERSION"'/g' DEBIAN/control
     # build
     - dpkg -b . build.deb
     - dpkg -I build.deb
@@ -92,13 +94,14 @@ build:pacman:
       changes:
         - app/**/*
         - .PKGBUILD/**/*
+        - .gitlab-ci.yml
       variables:
         VERSION: "0.0.1"
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       variables:
         VERSION: "0.0.1"
   before_script:
-    - echo -e "VERSION=$CI_BUILD_REF_NAME\nCOMMIT=$CI_COMMIT_SHA" > version.env
+    #- echo -e "VERSION=$VERSION\nCOMMIT=$CI_COMMIT_SHA" > version.env
     # install build dependencies
     - pacman -Syu --noconfirm git
     # create a build-user because "makepkg" don't like root user
@@ -113,7 +116,7 @@ build:pacman:
     # download dependencies
     - source PKGBUILD && pacman -Syu --noconfirm --needed --asdeps "${makedepends[@]}" "${depends[@]}"
     # build
-    - sudo -u build makepkg -s
+    - sudo --preserve-env -u build makepkg -s
   artifacts:
     expire_in: 1 week
     paths: