summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorohfp <1813007-ohfp@users.noreply.gitlab.com>2021-02-03 01:22:48 +0100
committerohfp <1813007-ohfp@users.noreply.gitlab.com>2021-02-03 01:22:52 +0100
commit7af6dcb2b08ce1ee487307cc2c2bad908e8f527b (patch)
treeb086ab381f39b1e9e89c74a59d8645002768bc44
parentdebug ci (diff)
downloadlibrewolf-debian-7af6dcb2b08ce1ee487307cc2c2bad908e8f527b.tar.gz
librewolf-debian-7af6dcb2b08ce1ee487307cc2c2bad908e8f527b.tar.bz2
librewolf-debian-7af6dcb2b08ce1ee487307cc2c2bad908e8f527b.zip
maybe more globbery will help
-rw-r--r--.gitlab-ci.yml5
-rwxr-xr-xscripts/prep-librewolf-dpkg.sh8
2 files changed, 3 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18fe233..25377a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,8 @@ variables:
expire_in: 1d
name: "librewolf-debian-prepared"
paths:
- - "prepared/librewolf*.{dsc,xz}"
+ - "./**/librewolf*.dsc"
+ - "./**/librewolf*.xz"
.debian_build_config: &debian_build_config
stage: build
@@ -36,7 +37,7 @@ variables:
artifacts:
name: "librewolf-${pkgver}-${pkgrel}_${CARCH}"
paths:
- - "out/librewolf-${pkgver}-${pkgrel}*.deb"
+ - "./**/librewolf-${pkgver}-${pkgrel}*.deb"
build_debian_x86_64:
image: debian:sid
diff --git a/scripts/prep-librewolf-dpkg.sh b/scripts/prep-librewolf-dpkg.sh
index 94fa1ed..63674e9 100755
--- a/scripts/prep-librewolf-dpkg.sh
+++ b/scripts/prep-librewolf-dpkg.sh
@@ -284,13 +284,5 @@ sed -r \
done | awk '{print " "$2,$1,$3}'
} >> librewolf_"${debian_firefox_version}".dsc
-## some debuggery:
-
-echo "pwd: $(pwd)"
-echo "ci_project_dir: ${CI_PROJECT_DIR}"
-echo "work_dir: ${work_dir}"
-echo "find:"
-find ${CI_PROJECT_DIR} -name '*.dsc'
-
# And now you have in the ${work_dir} location three files.
# librewolf_80.3.orig.tar.xz librewolf_80.3-1.debian.tar.xz librewolf_80.3-1.dsc
bgstack15