From 49138fb2e9e75b0e0b1d2709deb4751fc01becfb Mon Sep 17 00:00:00 2001
From: Oscar Krause <oscar.krause@collinwebdesigns.de>
Date: Wed, 28 Dec 2022 21:28:50 +0100
Subject: [PATCH] some refactorings

---
 .gitlab-ci.yml                                      | 9 ++++++++-
 PKGBUILD => PKGBUILD/PKGBUILD                       | 2 +-
 fastapi-dls.default => PKGBUILD/fastapi-dls.default | 0
 fastapi-dls.install => PKGBUILD/fastapi-dls.install | 0
 fastapi-dls.service => PKGBUILD/fastapi-dls.service | 0
 5 files changed, 9 insertions(+), 2 deletions(-)
 rename PKGBUILD => PKGBUILD/PKGBUILD (94%)
 rename fastapi-dls.default => PKGBUILD/fastapi-dls.default (100%)
 rename fastapi-dls.install => PKGBUILD/fastapi-dls.install (100%)
 rename fastapi-dls.service => PKGBUILD/fastapi-dls.service (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4879653..54e9cc2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,10 +48,17 @@ build:pamac:
     - if: $CI_COMMIT_BRANCH == "archlinux-makepkg"
   before_script:
     - pacman -Syu --noconfirm git
+    # create build directory for .deb sources
+    - mkdir build
+    # copy install instructions
+    - cp -r PKGBUILD build/
+    # "makepkg" don't likes root user
     - useradd --no-create-home --shell=/bin/false build && usermod -L build
     - 'echo "build ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers'
     - 'echo "root ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers'
     - chown -R build:build .
+    # cd into "build/"
+    - cd build/
   script:
     # download dependencies
     - source PKGBUILD && pacman -Syu --noconfirm --needed --asdeps "${makedepends[@]}" "${depends[@]}"
@@ -60,7 +67,7 @@ build:pamac:
   artifacts:
     expire_in: 1 week
     paths:
-      - "*.pkg.tar.zst"
+      - build/*.pkg.tar.zst
 
 test:
   image: python:3.10-slim-bullseye
diff --git a/PKGBUILD b/PKGBUILD/PKGBUILD
similarity index 94%
rename from PKGBUILD
rename to PKGBUILD/PKGBUILD
index a70b36e..0ed2337 100644
--- a/PKGBUILD
+++ b/PKGBUILD/PKGBUILD
@@ -11,7 +11,7 @@ license=('MIT')
 depends=('python' 'python-jose' 'python-starlette' 'python-httpx' 'python-fastapi' 'python-dotenv' 'python-dateutil' 'python-sqlalchemy' 'python-pycryptodome' 'uvicorn' 'python-markdown' 'openssl')
 provider=("$pkgname")
 install="$pkgname.install"
-source=('git+https://git.collinwebdesigns.de/oscar.krause/fastapi-dls.git#commit=3d5203dae054020e6f56e5f457fac1fbacc6f05d' # https://gitea.publichub.eu/oscar.krause/fastapi-dls.git
+source=('git+https://git.collinwebdesigns.de/oscar.krause/fastapi-dls.git#commit=$CI_COMMIT_SHA' # https://gitea.publichub.eu/oscar.krause/fastapi-dls.git
         "$pkgname.default"
         "$pkgname.service")
 sha256sums=('SKIP'
diff --git a/fastapi-dls.default b/PKGBUILD/fastapi-dls.default
similarity index 100%
rename from fastapi-dls.default
rename to PKGBUILD/fastapi-dls.default
diff --git a/fastapi-dls.install b/PKGBUILD/fastapi-dls.install
similarity index 100%
rename from fastapi-dls.install
rename to PKGBUILD/fastapi-dls.install
diff --git a/fastapi-dls.service b/PKGBUILD/fastapi-dls.service
similarity index 100%
rename from fastapi-dls.service
rename to PKGBUILD/fastapi-dls.service