Skip to content

Commit

Permalink
MDEV-28628: new debian package version name
Browse files Browse the repository at this point in the history
  • Loading branch information
grooverdan authored and fauust committed Jun 16, 2022
1 parent 8599ed7 commit 5df6bb8
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions scripts/docker-library-build-and-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,29 @@ container_tag=${container_tag,,*}
case "${buildername#*ubuntu-}" in
2204-deb-autobake)
base=jammy
pkgver=ubu2204
;;
2004-deb-autobake)
base=focal
;;
1804-deb-autobake)
base=bionic
pkgver=ubu2204
;;
*)
echo "unknown base buildername $buildername"
exit 0
;;
esac

# gradually exclude for other major version as
# https://github.com/MariaDB/server/commit/c168e16782fc449f61412e5afc1c01d59b77c675
# is merged up.
case "$container_tag" in
10.3)
;;
*)
pkgver=$base
;;
esac

buildernamebase=${buildername#*-}
builderarch=${buildername%%-*}

Expand Down Expand Up @@ -87,7 +97,7 @@ build() {
shift
t=$(mktemp)
buildah bud --layers "$@" --build-arg REPOSITORY="[trusted=yes] https://ci.mariadb.org/$tarbuildnum/${arch}-${buildernamebase}/debs ./" \
--build-arg MARIADB_VERSION="1:$mariadb_version+maria~$base" \
--build-arg MARIADB_VERSION="1:$mariadb_version+maria~$pkgver" \
"${annotations[@]}" \
"mariadb-docker/$master_branch" | tee "${t}"
image=$(tail -n 1 "$t")
Expand Down

0 comments on commit 5df6bb8

Please sign in to comment.