From 533d1a28e5b22a0508554194d776fbf5b48e0ded Mon Sep 17 00:00:00 2001 From: gggeek Date: Tue, 7 Dec 2021 12:34:50 +0000 Subject: [PATCH] wip github actions CI --- .github/workflows/ci.yml | 10 +++++----- tests/ci/setup/setup_php.sh | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b341f68..6771ca4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,11 +42,11 @@ jobs: # @todo add config setup scripts for windows run: | chmod 755 ./tests/ci/setup/*.sh - sudo ./tests/ci/setup/setup_perl.sh - sudo ./tests/ci/setup/setup_apache.sh - sudo ./tests/ci/setup/setup_privoxy.sh - sudo ./tests/ci/setup/setup_php.sh ${{ matrix.php }} - sudo ./tests/ci/setup/setup_composer.sh + sudo --preserve-env=GITHUB_ACTIONS ./tests/ci/setup/setup_perl.sh + sudo --preserve-env=GITHUB_ACTIONS ./tests/ci/setup/setup_apache.sh + sudo --preserve-env=GITHUB_ACTIONS ./tests/ci/setup/setup_privoxy.sh + sudo --preserve-env=GITHUB_ACTIONS ./tests/ci/setup/setup_php.sh ${{ matrix.php }} + sudo --preserve-env=GITHUB_ACTIONS ./tests/ci/setup/setup_composer.sh # Avoid downloading composer deps on every workflow. Is this useful/working for us? #- # uses: actions/cache@v2 diff --git a/tests/ci/setup/setup_php.sh b/tests/ci/setup/setup_php.sh index cc72a7f..1144910 100755 --- a/tests/ci/setup/setup_php.sh +++ b/tests/ci/setup/setup_php.sh @@ -37,6 +37,9 @@ if [ "${PHP_VERSION}" = default ]; then php${PHPSUFFIX}-mbstring \ php${PHPSUFFIX}-xdebug else + # on GHA runners ubuntu version, php 7.4 and 8.0 seem to be preinstalled. remove them if found + + DEBIAN_FRONTEND=noninteractive apt-get install -y language-pack-en-base software-properties-common LC_ALL=en_US.UTF-8 add-apt-repository ppa:ondrej/php apt-get update -- 2.43.0