From: Vasek Sraier <git@vakabus.cz>
Date: Thu, 28 Oct 2021 16:45:11 +0000 (+0200)
Subject: ci: fixed artefacts path
X-Git-Tag: v6.0.0a1~98
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=f45685b505534a7bfe2f7395b817d635b875ce11;p=thirdparty%2Fknot-resolver.git

ci: fixed artefacts path
---

diff --git a/manager/.gitlab-ci.yml b/manager/.gitlab-ci.yml
index 3745d870b..49702e371 100644
--- a/manager/.gitlab-ci.yml
+++ b/manager/.gitlab-ci.yml
@@ -49,6 +49,6 @@ package-debian:
     - bash scripts/make-debian-package.sh
   artifacts:
     paths:
-      - pkg/pkgs/debian-10
-      - pkg/srcpkgs/debian-10
+      - knot-resolver/pkg/pkgs/debian-10
+      - knot-resolver/pkg/srcpkgs/debian-10
     expire_in: 1 week
diff --git a/manager/scripts/make-debian-package.sh b/manager/scripts/make-debian-package.sh
index c1093c1a6..c78cb4955 100644
--- a/manager/scripts/make-debian-package.sh
+++ b/manager/scripts/make-debian-package.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+set -o errexit
+set -o nounset
+
 export DEBIAN_FRONTEND=noninteractive
 
 # upgrade system to latest
@@ -16,20 +19,23 @@ apt-get update -qqq
 apt-get install -y python3-pip
 pip3 install apkg
 
-# git
-apt-get install -y git
-
 # prepare the repo
 git clone https://gitlab.nic.cz/knot/knot-resolver
 cd knot-resolver
+git config --global user.email "ci@knot-resolver"
+git config --global user.name "GitLab CI"
 git checkout manager-pkg
 git rebase origin/manager-integration
 git submodule update --init --recursive
 
+# install meson, because its not installed for some reason
+apt-get install -y meson
+
 # build the package
 apkg system-setup
-apkg srcpkg
 apkg build -b
+apkg srcpkg
+