Commit 6926ac9f authored by Duncan Macleod's avatar Duncan Macleod

ci: cleaned up dist/ path for debian builds

parent 22e97f34
Pipeline #60873 passed with stages
in 2 minutes and 18 seconds
...@@ -70,11 +70,10 @@ dist:tarball: ...@@ -70,11 +70,10 @@ dist:tarball:
devscripts devscripts
lintian lintian
script: script:
- DIST_NAME=${CI_JOB_NAME#build:debian:}
- mkdir -pv dist/${DIST_NAME}
# unpack tarball # unpack tarball
- mkdir -pv build - mkdir -pv build
- tar -xvf dist/gwdatafind-server-*.tar.gz -C ./build --strip-components=1 - tar -xvf dist/gwdatafind-server-*.tar.gz -C ./build --strip-components=1
- rm -rf dist/*
- pushd build - pushd build
# install build dependencies # install build dependencies
- mk-build-deps --tool "apt-get -y" --install --remove - mk-build-deps --tool "apt-get -y" --install --remove
...@@ -94,7 +93,9 @@ dist:tarball: ...@@ -94,7 +93,9 @@ dist:tarball:
- *run-tests - *run-tests
# move things into dist/ # move things into dist/
- popd - popd
- mv -v python3-gwdatafind-server_*.deb gwdatafind-server_*.{buildinfo,changes} dist/${DIST_NAME}/ - DIST_DIR="dist/${CI_JOB_NAME#build:debian:}"
- mkdir -pv ${DIST_DIR}
- mv -v python3-gwdatafind-server_*.deb gwdatafind-server_*.{buildinfo,changes} ${DIST_DIR}/
build:debian:buster: build:debian:buster:
<<: *build-debian <<: *build-debian
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment