From 8cf7370b4d9c160bf655fc39bf977543b8fb8407 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Wed, 28 Dec 2022 21:36:15 +0100 Subject: [PATCH] fixes --- .gitlab-ci.yml | 11 +++-------- PKGBUILD/PKGBUILD | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 48a10c4..ca05f87 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,6 @@ build:apt: stage: build before_script: - apt-get update -qq && apt-get install -qq -y build-essential - - chmod 0755 -R . # create build directory for .deb sources - mkdir build # copy install instructions @@ -48,17 +47,13 @@ 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/ + # move PKGBUILD contents to root directory + - mv PKGBUILD/* . script: - pwd # download dependencies @@ -68,7 +63,7 @@ build:pamac: artifacts: expire_in: 1 week paths: - - build/*.pkg.tar.zst + - "*.pkg.tar.zst" test: image: python:3.10-slim-bullseye diff --git a/PKGBUILD/PKGBUILD b/PKGBUILD/PKGBUILD index 0ed2337..3a2fac0 100644 --- a/PKGBUILD/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=$CI_COMMIT_SHA' # https://gitea.publichub.eu/oscar.krause/fastapi-dls.git +source=('git+file:///builds/oscar.krause/fastapi-dls' # https://gitea.publichub.eu/oscar.krause/fastapi-dls.git "$pkgname.default" "$pkgname.service") sha256sums=('SKIP'