Skip to content

Commit ae185f3

Browse files
committed
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.
1 parent 09b1695 commit ae185f3

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

debian/salsa-ci.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,19 @@ stages:
2929
build:
3030
extends: .build-package
3131
script: &autobake-deb-steps
32+
# Run Salsa-CI .build-before-script equivalent
3233
- mkdir -p ${WORKING_DIR} ${CCACHE_WORK_DIR}
3334
- mv ${CCACHE_WORK_DIR} ${CCACHE_TMP_DIR}
34-
- apt-get update && apt-get install --yes devscripts equivs ccache build-essential
35-
# Installing build-essential (sic!) until https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=958414 is fixed
35+
# Run Salsa-CI .build-script equivalent
3636
- export CCACHE_DIR="${CCACHE_TMP_DIR}"
37+
- apt-get update && eatmydata apt-get install --yes --no-install-recommends aptitude devscripts ccache equivs
38+
- cd ${WORKING_DIR}/${SOURCE_DIR}
39+
- eatmydata install-build-deps.sh .
3740
- update-ccache-symlinks; ccache -z # Zero out ccache counters
38-
- mk-build-deps debian/control -t "apt-get -y -o Debug::pkgProblemResolver=yes --no-install-recommends" -r -i
3941
- while true; do sleep 600; echo "10 minutes passed" >&2; done & # Progress keeper since build is long and silent
4042
- debian/autobake-deb.sh |& tail -n 10000 # Keep Gitlab-CI output under 4 MB
41-
- cd ..; rm -rfv *.tmp # Clean away build files not to store as artifacts
42-
- cp -v *.* ${WORKING_DIR}/
43-
- rm -rf "${WORKING_DIR}/source_dir" # Remove excess source files
43+
- cd ${WORKING_DIR}
44+
- rm -rf ${WORKING_DIR}/${SOURCE_DIR}
4445
- du -shc ${WORKING_DIR}/* # Show total file size of artifacts. Must stay are under 100 MB.
4546
- ccache -s # Show ccache stats to validate it worked
4647
- mv ${CCACHE_TMP_DIR} ${CCACHE_WORK_DIR} || true
@@ -114,8 +115,10 @@ build native deb:
114115
ccache -s
115116
mv ${CCACHE_TMP_DIR} ${CCACHE_WORK_DIR}
116117

117-
autopkgtest:
118-
extends: .test-autopkgtest
118+
# Temporarily ignore until https://github.com/MariaDB/server/pull/1729 is merged
119+
missing-breaks:
120+
extends: .test-missing-breaks
121+
allow_failure: true
119122

120123
piuparts:
121124
extends: .test-piuparts

0 commit comments

Comments
 (0)