On Fri, 10 Aug 2018 01:12:28 +1000 Daniel Axtens <[email protected]> wrote:
> Hi Daniel, > > > +matrix: > > + include: > > + - addons: > > + postgresql: "10" > > + apt: > > + packages: > > + - postgresql-10 > > + - postgresql-client-10 > > + env: > > + - PGPORT=5433 > > + - PW_TEST_DB_PORT=5433 > > + - PW_TEST_DB_TYPE=postgres > > + - PW_TEST_DB_USER=travis > > + - PW_TEST_DB_PASS="" > > > The password is redundant here as it's also supplied in the global: > var list. quite right. > It's not documented in the commit message, but if I understand > correctly, the reason you need to specify PGPORT and PW_TEST_DB_PORT > is because the postgres server runs _in addition to_ the original 9.6 > server on 5432. So the new server picks 5433 and we need to tell psql > (PGPORT) The server installation I thought also picked up on the PGPORT. > and patchwork (PW_TEST_DB_PORT) about it. yes. > If you end up doing a respin of this series for patch 2, please change > these things. If we end up keeping patch 2 as is or dropping it > entirely, I'll just make these changes when I merge. thanks. > > + - if [[ $PW_TEST_DB_TYPE == mysql ]]; then mysql -e 'create > > database patchwork character set utf8;'; fi > > + - if [[ $PW_TEST_DB_TYPE == postgres ]]; then psql -c "create > > database patchwork with ENCODING = 'UTF8';" -U $PW_TEST_DB_USER; > > fi > > Thanks for cleaning this up. consider moving to utf8mb4 for MySQL at some point. The default is a 3 char version which doesn't cover all. > > script: > > + - > > > + if [[ $PW_TEST_DB_TYPE == mysql ]]; > > + then > > + mysql -e 'SELECT VERSION(), CURRENT_USER();' -u > > $PW_TEST_DB_USER patchwork; > > + else > > + psql -c "SELECT VERSION(), CURRENT_USER, current_database()" > > -U $PW_TEST_DB_USER patchwork; > > + fi > > I really like this bit, thanks! easy. _______________________________________________ Patchwork mailing list [email protected] https://lists.ozlabs.org/listinfo/patchwork
