Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mariadb connector packaging script to allow upgrades to 3.4 #2576

Merged
merged 1 commit into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1388,7 +1388,7 @@ resources:
type: http-resource
source:
index: "https://mariadb.org/connector-c/all-releases/"
regex: '>(?P<version>3\.3.\d+)</a></td><td>\d{4}-\d{2}-\d{2}</td><td>Stable'
regex: '>(?P<version>3\.\d+.\d+)</a></td><td>\d{4}-\d{2}-\d{2}</td><td>Stable'
uri: "https://ftp.osuosl.org/pub/mariadb/connector-c-{version}/mariadb-connector-c-{version}-src.tar.gz"

- name: postgres-10-src
Expand Down
22 changes: 11 additions & 11 deletions packages/mysql/packaging
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# abort script on any command that exit with a non zero value
set -e

(
set -e
tar xzf mysql/mariadb-connector-c-*-src.tar.gz
cd mariadb-connector-c-*-src
mkdir bld
cd bld
cmake .. -DCMAKE_INSTALL_PREFIX=${BOSH_INSTALL_TARGET}
make
make install
)

mkdir -p ${BOSH_INSTALL_TARGET}/bin/
cp mysql-customization/mariadb_config-wrapper.sh ${BOSH_INSTALL_TARGET}/bin/

tar xzf mysql/mariadb-connector-c-*-src.tar.gz
cd mariadb-connector-c-*-src
cmake \
-DCMAKE_INSTALL_PREFIX=${BOSH_INSTALL_TARGET} \
-DDEFAULT_SSL_VERIFY_SERVER_CERT=0
# ^ Needed for mariadb-connector-c >3.4.0 due to changes in default TLS mode. May be removable if mysql2 gem gets updated: https://github.com/brianmario/mysql2/issues/1379

make
make install
Loading