From 50d036f2061d397ef6d2f0731ae5613190634c90 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Wed, 3 May 2023 14:04:41 +0200 Subject: [PATCH] ci: update actions to ubuntu 22.04 and recent PHP --- .github/workflows/ci.yml | 91 +++++++++++++++++++++--------- scripts/gen_github_workflow_ci.php | 8 +-- 2 files changed, 68 insertions(+), 31 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a546008..fd250c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: enable_maintainer_zts: "yes" enable_json: "yes" PQ_DSN: "postgres:///runner" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -51,7 +51,7 @@ jobs: enable_maintainer_zts: "yes" enable_json: "yes" PQ_DSN: "postgres:///runner" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -87,7 +87,7 @@ jobs: enable_maintainer_zts: "yes" enable_json: "yes" PQ_DSN: "postgres:///runner" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -123,7 +123,7 @@ jobs: enable_maintainer_zts: "yes" enable_json: "yes" PQ_DSN: "postgres:///runner" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -159,7 +159,7 @@ jobs: enable_maintainer_zts: "yes" enable_json: "yes" PQ_DSN: "postgres:///runner" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -187,14 +187,51 @@ jobs: run: | make -f scripts/ci/Makefile test - next-0: - name: "next-0 (8.1)" + old-matrix-5: + name: "old-matrix-5 (8.0)" + env: + PHP: "8.0" + enable_debug: "yes" + enable_maintainer_zts: "yes" + enable_json: "yes" + PQ_DSN: "postgres:///runner" + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v2 + with: + submodules: true + - name: Install + run: | + sudo apt-get install -y \ + php-cli \ + php-pear \ + libpq-dev \ + re2c + - name: Prepare + run: | + make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php + make -f scripts/ci/Makefile pecl PECL=m6w6/ext-raphf.git:raphf:master + - name: Build + run: | + make -f scripts/ci/Makefile ext PECL=pq + - name: Prepare Test + run: | + sudo systemctl start postgresql + sudo -u postgres createuser --login runner + sudo -u postgres createdb -O runner runner + - name: Test + run: | + make -f scripts/ci/Makefile test + + old-matrix-6: + name: "old-matrix-6 (8.1)" env: PHP: "8.1" enable_debug: "yes" - enable_zts: "yes" + enable_maintainer_zts: "yes" + enable_json: "yes" PQ_DSN: "postgres:///runner" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -222,15 +259,15 @@ jobs: run: | make -f scripts/ci/Makefile test - next-1: - name: "next-1 (master)" + next-0: + name: "next-0 (master)" continue-on-error: true env: PHP: "master" enable_debug: "yes" enable_zts: "yes" PQ_DSN: "postgres:///runner" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -259,13 +296,13 @@ jobs: make -f scripts/ci/Makefile test cur-dbg-zts-0: - name: "cur-dbg-zts-0 (8.0)" + name: "cur-dbg-zts-0 (8.2)" env: - PHP: "8.0" + PHP: "8.2" enable_debug: "yes" enable_zts: "yes" PQ_DSN: "postgres:///runner" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -294,13 +331,13 @@ jobs: make -f scripts/ci/Makefile test cur-dbg-zts-1: - name: "cur-dbg-zts-1 (8.0)" + name: "cur-dbg-zts-1 (8.2)" env: - PHP: "8.0" + PHP: "8.2" enable_debug: "no" enable_zts: "yes" PQ_DSN: "postgres:///runner" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -329,13 +366,13 @@ jobs: make -f scripts/ci/Makefile test cur-dbg-zts-2: - name: "cur-dbg-zts-2 (8.0)" + name: "cur-dbg-zts-2 (8.2)" env: - PHP: "8.0" + PHP: "8.2" enable_debug: "yes" enable_zts: "no" PQ_DSN: "postgres:///runner" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -364,13 +401,13 @@ jobs: make -f scripts/ci/Makefile test cur-dbg-zts-3: - name: "cur-dbg-zts-3 (8.0)" + name: "cur-dbg-zts-3 (8.2)" env: - PHP: "8.0" + PHP: "8.2" enable_debug: "no" enable_zts: "no" PQ_DSN: "postgres:///runner" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -399,13 +436,13 @@ jobs: make -f scripts/ci/Makefile test cur-cov-0: - name: "cur-cov-0 (8.0)" + name: "cur-cov-0 (8.2)" env: CFLAGS: "-O0 -g --coverage" CXXFLAGS: "-O0 -g --coverage" - PHP: "8.0" + PHP: "8.2" PQ_DSN: "postgres:///runner" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: diff --git a/scripts/gen_github_workflow_ci.php b/scripts/gen_github_workflow_ci.php index 7c2e009..78d770a 100755 --- a/scripts/gen_github_workflow_ci.php +++ b/scripts/gen_github_workflow_ci.php @@ -11,16 +11,16 @@ jobs: github([ "old-matrix" => [ - "PHP" => ["7.0", "7.1", "7.2", "7.3", "7.4"], + "PHP" => ["7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1"], "enable_debug" => "yes", "enable_maintainer_zts" => "yes", "enable_json" => "yes", ], "next" => [ - "PHP" => ["8.1", "master"], + "PHP" => ["master"], "enable_debug" => "yes", "enable_zts" => "yes", ], @@ -46,7 +46,7 @@ foreach ($job as $id => $env) { } ?> PQ_DSN: "postgres:///runner" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: -- 2.30.2