From 733d803e99dfc9de0489d5b9d8aee5a4d0528411 Mon Sep 17 00:00:00 2001 From: Ben Fuhrmannek Date: Tue, 11 Jan 2022 15:55:26 +0100 Subject: changed build instructions for github workflows --- .github/workflows/distributions.yml | 52 +++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 14 deletions(-) (limited to '.github/workflows/distributions.yml') diff --git a/.github/workflows/distributions.yml b/.github/workflows/distributions.yml index 3b90fee..09bff96 100644 --- a/.github/workflows/distributions.yml +++ b/.github/workflows/distributions.yml @@ -9,7 +9,7 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - name: Remove php8 tests for php7 - run: rm -rf src/tests/*php8*/ + run: rm -rf src/tests/*php8*/ src/tests/*/*_php8.phpt src/tests/disable_function/*_signal.phpt - name: Install dependencies run: | apt update @@ -17,12 +17,11 @@ jobs: - name: Install pecl run: pecl install vld-beta - name: Build and run the testsuite - run: make tests + run: make release tests - name: Show logs in case of failure if: ${{ failure() }} run: | - grep -r . ./src/tests/*/*.out - grep -r . ./src/tests/*/*.diff + grep -r . --include='*.log' src/tests fedora: runs-on: ubuntu-latest @@ -31,19 +30,18 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - name: Remove php8 tests for php7 - run: rm -rf src/tests/*php8*/ + run: rm -rf src/tests/*php8*/ src/tests/*/*_php8.phpt src/tests/disable_function/*_signal.phpt - name: Install dependencies run: | dnf install -y php-devel php-pear make - name: Install pecl run: pecl install vld-beta - name: Build and run the testsuite - run: make tests + run: make release tests - name: Show logs in case of failure if: ${{ failure() }} run: | - grep -r . ./src/tests/*/*.out - grep -r . ./src/tests/*/*.diff + grep -r . --include='*.log' src/tests ubuntu: runs-on: ubuntu-latest @@ -64,8 +62,7 @@ jobs: - name: Show logs in case of failure if: ${{ failure() }} run: | - grep -r . ./src/tests/*/*.out - grep -r . ./src/tests/*/*.diff + grep -r . --include='*.log' src/tests archlinux: runs-on: ubuntu-latest @@ -91,8 +88,7 @@ jobs: continue-on-error: true if: ${{ failure() }} run: | - grep -r . ./src/tests/*/*.out - grep -r . ./src/tests/*/*.diff + grep -r . --include='*.log' src/tests alpine: runs-on: ubuntu-latest @@ -116,5 +112,33 @@ jobs: if: ${{ failure() }} continue-on-error: true run: | - grep -r . ./src/tests/*/*.out - grep -r . ./src/tests/*/*.diff + grep -r . --include='*.log' src/tests + + ## PHP 8 + alpine: + runs-on: ubuntu-latest + container: alpine:edge + steps: + - name: Checkout code + uses: actions/checkout@v2 + # - name: Remove php7 tests for php8 + # run: rm -rf src/tests/*php7*/ + # - name: Remove tests failing on alpine for wathever reason + # run: rm -rf src/tests/*session*/ src/tests/broken_configuration/ src/tests/*cookie* src/tests/upload_validation/ + - name: Install dependencies + run: apk add php8-dev php8-cgi php8-simplexml php8-xml pcre-dev build-base php8-pear php8-openssl + - name: Install pecl + continue-on-error: true + run: pecl install vld-beta + - name: Link phpize + run: ln -s /usr/bin/phpize8 /usr/bin/phpize + - name: Link php-config + run: ln -s /usr/bin/php-config8 /usr/bin/php-config + - name: Build and run the testsuite + continue-on-error: true + run: make tests + - name: Show logs in case of failure + if: ${{ failure() }} + continue-on-error: true + run: | + grep -r . --include='*.log' src/tests -- cgit v1.3 From dab03c5c0df03c4cfda4e0b8a7da62b2feb4e2ac Mon Sep 17 00:00:00 2001 From: Ben Fuhrmannek Date: Tue, 11 Jan 2022 15:59:48 +0100 Subject: fixed syntax error in yaml --- .github/workflows/distributions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows/distributions.yml') diff --git a/.github/workflows/distributions.yml b/.github/workflows/distributions.yml index 09bff96..2cc81d4 100644 --- a/.github/workflows/distributions.yml +++ b/.github/workflows/distributions.yml @@ -115,7 +115,7 @@ jobs: grep -r . --include='*.log' src/tests ## PHP 8 - alpine: + alpine_php8: runs-on: ubuntu-latest container: alpine:edge steps: -- cgit v1.3 From e8da4951dabcddd04c6a2e6daa0dea08003e476f Mon Sep 17 00:00:00 2001 From: Ben Fuhrmannek Date: Wed, 12 Jan 2022 19:50:26 +0100 Subject: fix alpine test setup + minor fixes --- .github/workflows/distributions.yml | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to '.github/workflows/distributions.yml') diff --git a/.github/workflows/distributions.yml b/.github/workflows/distributions.yml index 2cc81d4..27d0c5d 100644 --- a/.github/workflows/distributions.yml +++ b/.github/workflows/distributions.yml @@ -50,7 +50,7 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - name: Remove php8 tests for php7 - run: rm -rf src/tests/*php8*/ + run: rm -rf src/tests/*php8*/ src/tests/*/*_php8.phpt - name: Install dependencies run: | apt update @@ -71,7 +71,7 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - name: Remove php8 tests for php7 - run: rm -rf src/tests/*php8*/ + run: rm -rf src/tests/*php8*/ src/tests/*/*_php8.phpt - name: Install dependencies continue-on-error: true run: | @@ -81,7 +81,7 @@ jobs: - name: Install pecl continue-on-error: true run: pecl install vld-beta - - name: Build and run the testsuite + - name: Build SP and run the testsuite continue-on-error: true run: make tests - name: Show logs in case of failure @@ -92,22 +92,25 @@ jobs: alpine: runs-on: ubuntu-latest - container: alpine:edge + container: alpine:latest steps: - name: Checkout code uses: actions/checkout@v2 - name: Remove php8 tests for php7 - run: rm -rf src/tests/*php8*/ + run: rm -rf src/tests/*php8*/ src/tests/*/*_php8.phpt - name: Remove tests failing on alpine for wathever reason - run: rm -rf src/tests/*session*/ src/tests/broken_configuration/ src/tests/*cookie* src/tests/upload_validation/ + run: rm -rf src/tests/cookies_encryption_warning src/tests/upload_validation/upload_validation.phpt /tests/broken_configuration/encrypt_regexp_cookies_bad_regexp.phpt - name: Install dependencies - run: apk add php7-dev php7-cgi php7-simplexml php7-xml pcre-dev build-base php7-pear php7-openssl + run: apk add php7-dev php7-cgi php7-simplexml php7-xml pcre-dev build-base php7-pear php7-openssl php7-session - name: Install pecl continue-on-error: true run: pecl install vld-beta - - name: Build and run the testsuite + - name: Build SP and run the testsuite continue-on-error: true - run: make tests + run: | + make release + ln -s $(php -r 'echo ini_get("extension_dir");')/* src/modules/ + make tests - name: Show logs in case of failure if: ${{ failure() }} continue-on-error: true @@ -121,22 +124,19 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v2 - # - name: Remove php7 tests for php8 - # run: rm -rf src/tests/*php7*/ - # - name: Remove tests failing on alpine for wathever reason - # run: rm -rf src/tests/*session*/ src/tests/broken_configuration/ src/tests/*cookie* src/tests/upload_validation/ + - name: Remove tests failing on alpine for wathever reason + run: rm -rf src/tests/cookies_encryption_warning src/tests/upload_validation/upload_validation.phpt - name: Install dependencies - run: apk add php8-dev php8-cgi php8-simplexml php8-xml pcre-dev build-base php8-pear php8-openssl + run: apk add php8-dev php8-cgi php8-simplexml php8-xml pcre-dev build-base php8-pear php8-openssl php8-session php8-curl - name: Install pecl continue-on-error: true run: pecl install vld-beta - - name: Link phpize - run: ln -s /usr/bin/phpize8 /usr/bin/phpize - - name: Link php-config - run: ln -s /usr/bin/php-config8 /usr/bin/php-config - - name: Build and run the testsuite + - name: Build SP and run the testsuite continue-on-error: true - run: make tests + run: | + make release + ln -s $(php -r 'echo ini_get("extension_dir");')/* src/modules/ + make tests - name: Show logs in case of failure if: ${{ failure() }} continue-on-error: true -- cgit v1.3 From 6cc6d844da9ae6216e373349413e719fd2465023 Mon Sep 17 00:00:00 2001 From: Ben Fuhrmannek Date: Wed, 12 Jan 2022 19:55:56 +0100 Subject: more alpine test fixes --- .github/workflows/distributions.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to '.github/workflows/distributions.yml') diff --git a/.github/workflows/distributions.yml b/.github/workflows/distributions.yml index 27d0c5d..79ae9b5 100644 --- a/.github/workflows/distributions.yml +++ b/.github/workflows/distributions.yml @@ -101,19 +101,17 @@ jobs: - name: Remove tests failing on alpine for wathever reason run: rm -rf src/tests/cookies_encryption_warning src/tests/upload_validation/upload_validation.phpt /tests/broken_configuration/encrypt_regexp_cookies_bad_regexp.phpt - name: Install dependencies - run: apk add php7-dev php7-cgi php7-simplexml php7-xml pcre-dev build-base php7-pear php7-openssl php7-session + run: apk add php7-dev php7-cgi php7-simplexml php7-xml pcre-dev build-base php7-pear php7-openssl php7-session bash - name: Install pecl continue-on-error: true run: pecl install vld-beta - name: Build SP and run the testsuite - continue-on-error: true run: | make release ln -s $(php -r 'echo ini_get("extension_dir");')/* src/modules/ make tests - name: Show logs in case of failure if: ${{ failure() }} - continue-on-error: true run: | grep -r . --include='*.log' src/tests @@ -127,18 +125,16 @@ jobs: - name: Remove tests failing on alpine for wathever reason run: rm -rf src/tests/cookies_encryption_warning src/tests/upload_validation/upload_validation.phpt - name: Install dependencies - run: apk add php8-dev php8-cgi php8-simplexml php8-xml pcre-dev build-base php8-pear php8-openssl php8-session php8-curl + run: apk add php8-dev php8-cgi php8-simplexml php8-xml pcre-dev build-base php8-pear php8-openssl php8-session php8-curl bash - name: Install pecl continue-on-error: true run: pecl install vld-beta - name: Build SP and run the testsuite - continue-on-error: true run: | make release ln -s $(php -r 'echo ini_get("extension_dir");')/* src/modules/ make tests - name: Show logs in case of failure if: ${{ failure() }} - continue-on-error: true run: | grep -r . --include='*.log' src/tests -- cgit v1.3 From 68944ff47089f509d6c7fde1bd98cd8c935acdf6 Mon Sep 17 00:00:00 2001 From: Ben Fuhrmannek Date: Wed, 12 Jan 2022 21:07:57 +0100 Subject: add grep to alpine test container --- .github/workflows/distributions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.github/workflows/distributions.yml') diff --git a/.github/workflows/distributions.yml b/.github/workflows/distributions.yml index 79ae9b5..9c19f39 100644 --- a/.github/workflows/distributions.yml +++ b/.github/workflows/distributions.yml @@ -101,7 +101,7 @@ jobs: - name: Remove tests failing on alpine for wathever reason run: rm -rf src/tests/cookies_encryption_warning src/tests/upload_validation/upload_validation.phpt /tests/broken_configuration/encrypt_regexp_cookies_bad_regexp.phpt - name: Install dependencies - run: apk add php7-dev php7-cgi php7-simplexml php7-xml pcre-dev build-base php7-pear php7-openssl php7-session bash + run: apk add php7-dev php7-cgi php7-simplexml php7-xml pcre-dev build-base php7-pear php7-openssl php7-session bash grep - name: Install pecl continue-on-error: true run: pecl install vld-beta @@ -125,7 +125,7 @@ jobs: - name: Remove tests failing on alpine for wathever reason run: rm -rf src/tests/cookies_encryption_warning src/tests/upload_validation/upload_validation.phpt - name: Install dependencies - run: apk add php8-dev php8-cgi php8-simplexml php8-xml pcre-dev build-base php8-pear php8-openssl php8-session php8-curl bash + run: apk add php8-dev php8-cgi php8-simplexml php8-xml pcre-dev build-base php8-pear php8-openssl php8-session php8-curl bash grep - name: Install pecl continue-on-error: true run: pecl install vld-beta -- cgit v1.3