diff --git a/.gitignore b/.gitignore index affcf59..c6d9176 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +build *.deb MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab7e5ad..a64204e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,9 +6,7 @@ include: smolensk15-nightly: script: - ./build_deb.sh - - mkdir build - ls -la - - ls -la .. - - mv ../*.deb build + - ls -la build extends: .scheduled-smolensk15 diff --git a/build_deb.sh b/build_deb.sh index 99291ea..fdf95b1 100755 --- a/build_deb.sh +++ b/build_deb.sh @@ -3,16 +3,19 @@ set -e V=$(grep -i "project.*VERSION.*LANGUAGES" CMakeLists.txt | sed 's/.*VERSION \([0-9.]*\) .*/\1/') -D=$(mktemp -d "/tmp/myx-cmake.XXXXXX") +D=build + mkdir -p "$D/myx-cmake-$V" cp -ap CMakeLists.txt MyxCMake "$D/myx-cmake-$V" pushd "$D" tar Jcf "myx-cmake_${V}.orig.tar.xz" "myx-cmake-$V" popd + cp -ap debian "$D/myx-cmake-$V" pushd "$D/myx-cmake-$V" dch -D unstable -v "${V}-1" -m "New version." dpkg-buildpackage -us -uc popd -cp -f ${D}/myx*deb . + +rm -rf "$D/myx-cmake-$V"