From 075532c04c03981343b7fb98215aac84da810751 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Thu, 23 Jan 2020 23:08:46 +0100
Subject: [PATCH] tu history
---
.gitlab-ci.yml | 3 ---
ci/docker_install_database.sh | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2fbb941d44e..10aef864833 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,7 +44,6 @@ job_php-7.3:
- cd /var/www/html/MaarchCourrier
- mkdir -p /var/www/html/MaarchCourrier
- sed 's/<databaseserver>.*<\/databaseserver>/<databaseserver>postgres<\/databaseserver>/;s/<databasepassword>.*<\/databasepassword>/<databasepassword><\/databasepassword>/;s/<databasename>.*<\/databasename>/<databasename>MaarchCourrier<\/databasename>/;s/<databaseuser>.*<\/databaseuser>/<databaseuser>maarch<\/databaseuser>/' apps/maarch_entreprise/xml/config.xml.default > apps/maarch_entreprise/xml/config.xml
- - sed -i -e "s/datestyle = 'iso, mdy'/datestyle = 'iso, dmy'/g" /var/lib/postgresql/data/postgresql.conf
- curl --location -s --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-7.phar
- chmod +x /usr/local/bin/phpunit
- phpunit --coverage-text --colors=never -c phpunit.xml
@@ -70,7 +69,6 @@ job_php-7.2:
#- npm set registry https://registry.npmjs.org/
#- npm install
- sed 's/<databaseserver>.*<\/databaseserver>/<databaseserver>postgres<\/databaseserver>/;s/<databasepassword>.*<\/databasepassword>/<databasepassword><\/databasepassword>/;s/<databasename>.*<\/databasename>/<databasename>MaarchCourrier<\/databasename>/;s/<databaseuser>.*<\/databaseuser>/<databaseuser>maarch<\/databaseuser>/' apps/maarch_entreprise/xml/config.xml.default > apps/maarch_entreprise/xml/config.xml
- - sed -i -e "s/datestyle = 'iso, mdy'/datestyle = 'iso, dmy'/g" /etc/postgresql/10.1/main/postgresql.conf
- curl --location -s --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-7.phar
- chmod +x /usr/local/bin/phpunit
- phpunit --coverage-text --colors=never -c phpunit.xml
@@ -96,7 +94,6 @@ job_php-7.1:
#- npm set registry https://registry.npmjs.org/
#- npm install
- sed 's/<databaseserver>.*<\/databaseserver>/<databaseserver>postgres<\/databaseserver>/;s/<databasepassword>.*<\/databasepassword>/<databasepassword><\/databasepassword>/;s/<databasename>.*<\/databasename>/<databasename>MaarchCourrier<\/databasename>/;s/<databaseuser>.*<\/databaseuser>/<databaseuser>maarch<\/databaseuser>/' apps/maarch_entreprise/xml/config.xml.default > apps/maarch_entreprise/xml/config.xml
- - sed -i -e "s/datestyle = 'iso, mdy'/datestyle = 'iso, dmy'/g" /etc/postgresql/10.1/main/postgresql.conf
- curl --location -s --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-7.phar
- chmod +x /usr/local/bin/phpunit
- phpunit --coverage-text --colors=never -c phpunit.xml
diff --git a/ci/docker_install_database.sh b/ci/docker_install_database.sh
index 49391be80e6..6df929d5145 100755
--- a/ci/docker_install_database.sh
+++ b/ci/docker_install_database.sh
@@ -11,4 +11,4 @@ apt-get install postgresql-client -yqq
psql -h "postgres" -U "$POSTGRES_USER" -d "$POSTGRES_DB" -w < /builds/maarch/MaarchCourrier/sql/structure.sql
psql -h "postgres" -U "$POSTGRES_USER" -d "$POSTGRES_DB" -w < /builds/maarch/MaarchCourrier/sql/data_fr.sql
-
+psql -h "postgres" -U "$POSTGRES_USER" -d "$POSTGRES_DB" -c 'SET datestyle = "ISO, DMY"'
--
GitLab