Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

build-pgroonga: Upgrade PGroonga from 3.0.3 to 3.1.0. 

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2023-07-21 14:02:23 -07:00 committed by Tim Abbott
parent 61f30fa347
commit 5ccb408f19
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/lib/build-pgroonga
View File

@ -1,8 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -euxo pipefail set -euxo pipefail
version="3.0.3" version="3.1.0"
sha256=0c54af17afcf7c18e1a3aafadd5d5f7706a9fbcaebd56f4a38664847608e5c97 sha256=fd020a911ec223f5288e99131c91abb437a9a0aa9d5e51b8fdb96d633bd61fb9
tmpdir="$(mktemp -d)" tmpdir="$(mktemp -d)"
trap 'rm -r "$tmpdir"' EXIT trap 'rm -r "$tmpdir"' EXIT

BIN
scripts/setup/apt-repos/zulip/apache-arrow-keyring.gpg Normal file
View File

Binary file not shown.

16
scripts/setup/apt-repos/zulip/custom.sh
View File

@ -2,6 +2,7 @@
set -euo pipefail set -euo pipefail
if [[ ! -e /usr/share/doc/groonga-apt-source/copyright ]]; then if [[ ! -e /usr/share/doc/groonga-apt-source/copyright ]]; then
arrow_keyring=$(readlink -f "$LIST_PATH/apache-arrow-keyring.gpg")
pgroonga_apt_sign_key=$(readlink -f "$LIST_PATH/pgroonga-packages.groonga.org.asc") pgroonga_apt_sign_key=$(readlink -f "$LIST_PATH/pgroonga-packages.groonga.org.asc")
remove_pgroonga_apt_tmp_dir() { remove_pgroonga_apt_tmp_dir() {
@ -26,10 +27,17 @@ if [[ ! -e /usr/share/doc/groonga-apt-source/copyright ]]; then
read -r distribution read -r distribution
read -r release read -r release
} <<<"$os_info" } <<<"$os_info"
if [ "$distribution" = debian ] && [ "$release" = bookworm ]; then if [ "$distribution" = debian ] && [ "$release" = bookworm ]; then
# PGroonga binaries are not yet provided for Debian 12. # As of Debian 12, the Groonga repository depends on the
exit # Apache Arrow repository.
arrow_apt_source_deb="apache-arrow-apt-source-latest-$release.deb"
arrow_apt_source_deb_sign="$arrow_apt_source_deb.asc"
curl -fLO --retry 3 "https://apache.jfrog.io/artifactory/arrow/$distribution/$arrow_apt_source_deb"
curl -fLO --retry 3 "https://apache.jfrog.io/artifactory/arrow/$distribution/$arrow_apt_source_deb_sign"
gpgv --keyring="$arrow_keyring" "$arrow_apt_source_deb_sign" "$arrow_apt_source_deb"
fi fi
groonga_apt_source_deb="groonga-apt-source-latest-$release.deb" groonga_apt_source_deb="groonga-apt-source-latest-$release.deb"
groonga_apt_source_deb_sign="$groonga_apt_source_deb.asc.$pgroonga_apt_sign_key_fingerprint" groonga_apt_source_deb_sign="$groonga_apt_source_deb.asc.$pgroonga_apt_sign_key_fingerprint"
curl -fLO --retry 3 "https://packages.groonga.org/$distribution/$groonga_apt_source_deb" curl -fLO --retry 3 "https://packages.groonga.org/$distribution/$groonga_apt_source_deb"
@ -44,6 +52,10 @@ if [[ ! -e /usr/share/doc/groonga-apt-source/copyright ]]; then
# '.../groonga-apt-source-latest-$release.deb' couldn't be # '.../groonga-apt-source-latest-$release.deb' couldn't be
# accessed by user '_apt'. - pkgAcquire::Run (13: Permission denied) # accessed by user '_apt'. - pkgAcquire::Run (13: Permission denied)
chown _apt . chown _apt .
if [ "$distribution" = debian ] && [ "$release" = bookworm ]; then
apt-get -y install "./$arrow_apt_source_deb"
fi
apt-get -y install "./$groonga_apt_source_deb" apt-get -y install "./$groonga_apt_source_deb"
} }
touch "$STAMP_FILE" touch "$STAMP_FILE"

2
tools/ci/build-docker-images
View File

@ -4,4 +4,4 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
docker build . --build-arg=BASE_IMAGE=ubuntu:20.04 --pull --tag=zulip/ci:focal docker build . --build-arg=BASE_IMAGE=ubuntu:20.04 --pull --tag=zulip/ci:focal
docker build . --build-arg=BASE_IMAGE=ubuntu:22.04 --pull --tag=zulip/ci:jammy docker build . --build-arg=BASE_IMAGE=ubuntu:22.04 --pull --tag=zulip/ci:jammy
docker build . --build-arg=BASE_IMAGE=debian:11 --pull --tag=zulip/ci:bullseye docker build . --build-arg=BASE_IMAGE=debian:11 --pull --tag=zulip/ci:bullseye
docker build . --build-arg=BASE_IMAGE=debian:bookworm --pull --tag=zulip/ci:bookworm docker build . --build-arg=BASE_IMAGE=debian:12 --pull --tag=zulip/ci:bookworm