From c23143bde442840c79b509592d35e643d7e85422 Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Fri, 4 Dec 2020 13:10:32 +0100 Subject: [PATCH 01/10] #1079 MariaDB 10.4 --- .travis.yml | 9 ++++----- test/ci/mysql.yml | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index f7228ba0..4bbe4471 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,13 +23,14 @@ language: ruby sudo: true -dist: xenial +dist: focal rvm: - 2.6 -before_install: +before_script: - sudo mysql -e 'CREATE DATABASE IF NOT EXISTS test CHARACTER SET utf8mb4;' + - sudo mysql -e "GRANT ALL PRIVILEGES ON test.* TO 'travis'@'%';"; - psql -c 'create database test;' -U postgres - export WORKSPACE=`pwd`/workspace - export PATH_TO_DMSF=`pwd` @@ -40,8 +41,6 @@ before_install: - bash -x ./test/ci/redmine_install.sh -c - bash -x ./test/ci/redmine_install.sh -i -install: - script: - bash -x ./test/ci/redmine_install.sh -t @@ -63,4 +62,4 @@ services: - postgresql addons: - mariadb: '10.4' + mariadb: '10.5' diff --git a/test/ci/mysql.yml b/test/ci/mysql.yml index 01381c93..148d8a9f 100644 --- a/test/ci/mysql.yml +++ b/test/ci/mysql.yml @@ -2,6 +2,6 @@ test: adapter: mysql2 database: test - username: root + username: travis encoding: utf8mb4 collation: utf8mb4_unicode_ci \ No newline at end of file From e326878f3c9fffff2be9ac0547ade869dfb13f71 Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Thu, 17 Dec 2020 10:31:52 +0100 Subject: [PATCH 02/10] #1079 travis --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index 32921442..81a9bebb 100644 --- a/Gemfile +++ b/Gemfile @@ -20,6 +20,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +source 'https://rubygems.org' + gem 'zip-zip' gem 'simple_enum' gem 'uuidtools' From 149e675379a8231c1cf19863db9e824857e6125d Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Thu, 17 Dec 2020 10:56:44 +0100 Subject: [PATCH 03/10] #1079 travis --- .travis.yml | 3 ++- test/ci/mysql.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4bbe4471..38652540 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,8 @@ rvm: before_script: - sudo mysql -e 'CREATE DATABASE IF NOT EXISTS test CHARACTER SET utf8mb4;' - - sudo mysql -e "GRANT ALL PRIVILEGES ON test.* TO 'travis'@'%';"; + - sudo mysql -e "CREATE USER 'dmsf'@'localhost' IDENTIFIED BY 'pes+kocka'"; + - sudo mysql -e "GRANT ALL PRIVILEGES ON test.* TO 'dmsf'@'%'"; - psql -c 'create database test;' -U postgres - export WORKSPACE=`pwd`/workspace - export PATH_TO_DMSF=`pwd` diff --git a/test/ci/mysql.yml b/test/ci/mysql.yml index 148d8a9f..afa89274 100644 --- a/test/ci/mysql.yml +++ b/test/ci/mysql.yml @@ -2,6 +2,7 @@ test: adapter: mysql2 database: test - username: travis + username: dmsf + password: "pes+kocka" encoding: utf8mb4 collation: utf8mb4_unicode_ci \ No newline at end of file From e66ee5d12283b596d0505fdfc042a06610a39b8b Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Thu, 17 Dec 2020 11:57:06 +0100 Subject: [PATCH 04/10] #1079 travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 38652540..3b0413a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ rvm: before_script: - sudo mysql -e 'CREATE DATABASE IF NOT EXISTS test CHARACTER SET utf8mb4;' - sudo mysql -e "CREATE USER 'dmsf'@'localhost' IDENTIFIED BY 'pes+kocka'"; - - sudo mysql -e "GRANT ALL PRIVILEGES ON test.* TO 'dmsf'@'%'"; + - sudo mysql -e "GRANT ALL PRIVILEGES ON test.* TO 'dmsf'@'localhost'"; - psql -c 'create database test;' -U postgres - export WORKSPACE=`pwd`/workspace - export PATH_TO_DMSF=`pwd` From f8ce208dad1fdc2cf3bac886280e21f4b5dea7f3 Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Thu, 17 Dec 2020 12:31:36 +0100 Subject: [PATCH 05/10] #1079 travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3b0413a8..0890f2af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,3 +64,4 @@ services: addons: mariadb: '10.5' + postgresql: '9.6' From 985cd4b504e9523823fd5f34002078b5af6c9b15 Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Thu, 17 Dec 2020 12:55:14 +0100 Subject: [PATCH 06/10] #1079 travis --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0890f2af..7ef14533 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,6 +49,8 @@ after_script: - bash -x ./test/ci/redmine_install.sh -u env: + global: + - PGPORT=5433 - DB=sqlite REDMINE_GIT_TAG=4.0-stable - DB=mysql REDMINE_GIT_TAG=4.0-stable - DB=postgres REDMINE_GIT_TAG=4.0-stable @@ -64,4 +66,8 @@ services: addons: mariadb: '10.5' - postgresql: '9.6' + postgresql: '10' + apt: + packages: + - postgresql-10 + - postgresql-client-10 From da2236254700ded28cf487840ad36768c135d9ea Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Thu, 17 Dec 2020 14:18:29 +0100 Subject: [PATCH 07/10] #1079 travis --- .travis.yml | 8 ++++---- test/ci/mysql.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7ef14533..fe1f30c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ rvm: before_script: - sudo mysql -e 'CREATE DATABASE IF NOT EXISTS test CHARACTER SET utf8mb4;' - - sudo mysql -e "CREATE USER 'dmsf'@'localhost' IDENTIFIED BY 'pes+kocka'"; + - sudo mysql -e "CREATE USER 'dmsf'@'localhost' IDENTIFIED BY 'eGCq9ueVpUH3'"; - sudo mysql -e "GRANT ALL PRIVILEGES ON test.* TO 'dmsf'@'localhost'"; - psql -c 'create database test;' -U postgres - export WORKSPACE=`pwd`/workspace @@ -66,8 +66,8 @@ services: addons: mariadb: '10.5' - postgresql: '10' + postgresql: '12' apt: packages: - - postgresql-10 - - postgresql-client-10 + - postgresql-12 + - postgresql-client-12 diff --git a/test/ci/mysql.yml b/test/ci/mysql.yml index afa89274..dad1f7b7 100644 --- a/test/ci/mysql.yml +++ b/test/ci/mysql.yml @@ -3,6 +3,6 @@ test: adapter: mysql2 database: test username: dmsf - password: "pes+kocka" + password: "eGCq9ueVpUH3" encoding: utf8mb4 collation: utf8mb4_unicode_ci \ No newline at end of file From 3988afce99d04602d8c9474042e4ae522eb7473d Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Fri, 18 Dec 2020 08:27:45 +0100 Subject: [PATCH 08/10] #1079 travis --- .travis.yml | 1 + test/ci/postgres.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index fe1f30c1..6d25fb13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,7 @@ before_script: - sudo mysql -e "CREATE USER 'dmsf'@'localhost' IDENTIFIED BY 'eGCq9ueVpUH3'"; - sudo mysql -e "GRANT ALL PRIVILEGES ON test.* TO 'dmsf'@'localhost'"; - psql -c 'create database test;' -U postgres + - psql -c "ALTER ROLE postgres WITH PASSWORD 'ErgiLXF5Nr4M'" - export WORKSPACE=`pwd`/workspace - export PATH_TO_DMSF=`pwd` - export PATH_TO_REDMINE=$WORKSPACE/redmine diff --git a/test/ci/postgres.yml b/test/ci/postgres.yml index 0269c6e1..d3283a51 100644 --- a/test/ci/postgres.yml +++ b/test/ci/postgres.yml @@ -2,4 +2,6 @@ test: adapter: postgresql database: test + username: postgres + password: "ErgiLXF5Nr4M" encoding: utf8 \ No newline at end of file From 42e02fcf18d49954196d9b72f7863d7cd2307324 Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Tue, 22 Dec 2020 08:25:23 +0100 Subject: [PATCH 09/10] #1079 travis --- .travis.yml | 7 ------- test/ci/postgres.yml | 2 -- 2 files changed, 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d25fb13..94dcc683 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,6 @@ before_script: - sudo mysql -e "CREATE USER 'dmsf'@'localhost' IDENTIFIED BY 'eGCq9ueVpUH3'"; - sudo mysql -e "GRANT ALL PRIVILEGES ON test.* TO 'dmsf'@'localhost'"; - psql -c 'create database test;' -U postgres - - psql -c "ALTER ROLE postgres WITH PASSWORD 'ErgiLXF5Nr4M'" - export WORKSPACE=`pwd`/workspace - export PATH_TO_DMSF=`pwd` - export PATH_TO_REDMINE=$WORKSPACE/redmine @@ -51,7 +50,6 @@ after_script: env: global: - - PGPORT=5433 - DB=sqlite REDMINE_GIT_TAG=4.0-stable - DB=mysql REDMINE_GIT_TAG=4.0-stable - DB=postgres REDMINE_GIT_TAG=4.0-stable @@ -67,8 +65,3 @@ services: addons: mariadb: '10.5' - postgresql: '12' - apt: - packages: - - postgresql-12 - - postgresql-client-12 diff --git a/test/ci/postgres.yml b/test/ci/postgres.yml index d3283a51..0269c6e1 100644 --- a/test/ci/postgres.yml +++ b/test/ci/postgres.yml @@ -2,6 +2,4 @@ test: adapter: postgresql database: test - username: postgres - password: "ErgiLXF5Nr4M" encoding: utf8 \ No newline at end of file From 433d058c01fb8b6a59bf57840bd7020e39abc923 Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Tue, 22 Dec 2020 08:42:25 +0100 Subject: [PATCH 10/10] #1079 travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 94dcc683..ddf71306 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ language: ruby sudo: true -dist: focal +dist: bionic rvm: - 2.6 @@ -64,4 +64,4 @@ services: - postgresql addons: - mariadb: '10.5' + mariadb: '10.4'