diff options
| author | Otto Kekäläinen <otto@kekalainen.net> | 2020-12-26 21:17:11 +0200 |
|---|---|---|
| committer | Otto Kekäläinen <otto@kekalainen.net> | 2021-01-03 21:14:32 +0200 |
| commit | ae185f393c4dd6d2617fbd6a445a08a76d6ba919 (patch) | |
| tree | 35541354b9c975687948df0fd484dde59d0238c6 | |
| parent | 09b1695b418c28561c77588d5c2f98f169fb4105 (diff) | |
| download | mariadb-git-ae185f393c4dd6d2617fbd6a445a08a76d6ba919.tar.gz | |
Salsa-CI: Use aptitude to resolve build dependencies
Adopt the same install-build-deps.sh the upstream Salsa-CI has started
using. Since we have our own custom build step (to support autobake-deb.sh)
we need to maintain in like this and adopt to upstream changes.
This change will make the stretch-backports build pass and use the
backported libzstd-dev 1.3.8 library (to satisfy the > 1.3.3 requirement).
Also clean away excess autopkgtest stanza and allow missing-breaks to
fail so that in total Salsa-CI would now pass.
| -rw-r--r-- | debian/salsa-ci.yml | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml index d1030352cf4..5f0657b2d13 100644 --- a/debian/salsa-ci.yml +++ b/debian/salsa-ci.yml @@ -29,18 +29,19 @@ stages: build: extends: .build-package script: &autobake-deb-steps + # Run Salsa-CI .build-before-script equivalent - mkdir -p ${WORKING_DIR} ${CCACHE_WORK_DIR} - mv ${CCACHE_WORK_DIR} ${CCACHE_TMP_DIR} - - apt-get update && apt-get install --yes devscripts equivs ccache build-essential - # Installing build-essential (sic!) until https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=958414 is fixed + # Run Salsa-CI .build-script equivalent - export CCACHE_DIR="${CCACHE_TMP_DIR}" + - apt-get update && eatmydata apt-get install --yes --no-install-recommends aptitude devscripts ccache equivs + - cd ${WORKING_DIR}/${SOURCE_DIR} + - eatmydata install-build-deps.sh . - update-ccache-symlinks; ccache -z # Zero out ccache counters - - mk-build-deps debian/control -t "apt-get -y -o Debug::pkgProblemResolver=yes --no-install-recommends" -r -i - while true; do sleep 600; echo "10 minutes passed" >&2; done & # Progress keeper since build is long and silent - debian/autobake-deb.sh |& tail -n 10000 # Keep Gitlab-CI output under 4 MB - - cd ..; rm -rfv *.tmp # Clean away build files not to store as artifacts - - cp -v *.* ${WORKING_DIR}/ - - rm -rf "${WORKING_DIR}/source_dir" # Remove excess source files + - cd ${WORKING_DIR} + - rm -rf ${WORKING_DIR}/${SOURCE_DIR} - du -shc ${WORKING_DIR}/* # Show total file size of artifacts. Must stay are under 100 MB. - ccache -s # Show ccache stats to validate it worked - mv ${CCACHE_TMP_DIR} ${CCACHE_WORK_DIR} || true @@ -114,8 +115,10 @@ build native deb: ccache -s mv ${CCACHE_TMP_DIR} ${CCACHE_WORK_DIR} -autopkgtest: - extends: .test-autopkgtest +# Temporarily ignore until https://github.com/MariaDB/server/pull/1729 is merged +missing-breaks: + extends: .test-missing-breaks + allow_failure: true piuparts: extends: .test-piuparts |