From 21b4276f0cc8c47853b117dcda9957cd0cb6ecd2 Mon Sep 17 00:00:00 2001 From: gggeek Date: Sun, 13 Dec 2020 16:01:25 +0000 Subject: [PATCH] wip travis --- .travis.yml | 2 +- tests/ci/setup/setup_php.sh | 3 ++- tests/ci/setup/setup_php_travis.sh | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2f500cbd..d0a2fbef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ before_install: - sudo chmod 755 ./tests/ci/setup/*.sh - sudo ./tests/ci/setup/setup_apache.sh - sudo ./tests/ci/setup/setup_privoxy.sh - - sudo ./tests/ci/setup/setup_php_travis.sh + - ./tests/ci/setup/setup_php_travis.sh install: - composer install diff --git a/tests/ci/setup/setup_php.sh b/tests/ci/setup/setup_php.sh index e4302b90..ad94b814 100644 --- a/tests/ci/setup/setup_php.sh +++ b/tests/ci/setup/setup_php.sh @@ -1,9 +1,10 @@ #!/bin/sh +# To be kept in sync with setup_php_travis.sh + set -e configure_php_ini() { - # @todo make this idempotent so that it can be run multiple times in a row echo "cgi.fix_pathinfo = 1" >> "${1}" echo "always_populate_raw_post_data = -1" >> "${1}" diff --git a/tests/ci/setup/setup_php_travis.sh b/tests/ci/setup/setup_php_travis.sh index 35f16847..fd37f141 100644 --- a/tests/ci/setup/setup_php_travis.sh +++ b/tests/ci/setup/setup_php_travis.sh @@ -1,9 +1,10 @@ #!/bin/sh +# To be kept in sync with setup_php.sh + set -e configure_php_ini() { - # @todo make this idempotent so that it can be run multiple times in a row echo "cgi.fix_pathinfo = 1" >> "${1}" echo "always_populate_raw_post_data = -1" >> "${1}" -- 2.47.0