From 1e0808bcea8651c2ffbb798cd5e151f87bef429e Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 15 Jan 2021 13:09:37 +0100
Subject: [PATCH] gh-actions: ci: fix PQ_DSN

---
 .github/workflows/ci.yml           | 54 ++++++------------------------
 scripts/gen_github_workflow_ci.php |  8 +----
 2 files changed, 12 insertions(+), 50 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ad63594..62c3b35 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
       enable_debug: "yes"
       enable_maintainer_zts: "yes"
       enable_json: "yes"
-      enable_spl: "yes"
+      PQ_DSN: "postgres:///runner"
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
@@ -50,7 +50,7 @@ jobs:
       enable_debug: "yes"
       enable_maintainer_zts: "yes"
       enable_json: "yes"
-      enable_spl: "yes"
+      PQ_DSN: "postgres:///runner"
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
@@ -86,7 +86,7 @@ jobs:
       enable_debug: "yes"
       enable_maintainer_zts: "yes"
       enable_json: "yes"
-      enable_spl: "yes"
+      PQ_DSN: "postgres:///runner"
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
@@ -122,7 +122,7 @@ jobs:
       enable_debug: "yes"
       enable_maintainer_zts: "yes"
       enable_json: "yes"
-      enable_spl: "yes"
+      PQ_DSN: "postgres:///runner"
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
@@ -158,7 +158,7 @@ jobs:
       enable_debug: "yes"
       enable_maintainer_zts: "yes"
       enable_json: "yes"
-      enable_spl: "yes"
+      PQ_DSN: "postgres:///runner"
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
@@ -194,39 +194,7 @@ jobs:
       PHP: "master"
       enable_debug: "yes"
       enable_zts: "yes"
-      enable_spl: "yes"
-    runs-on: ubuntu-20.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
-
-  cur-none-0:
-    name: cur-none-0
-    env:
-      PHP: "8.0"
+      PQ_DSN: "postgres:///runner"
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
@@ -261,7 +229,7 @@ jobs:
       PHP: "8.0"
       enable_debug: "yes"
       enable_zts: "yes"
-      enable_spl: "yes"
+      PQ_DSN: "postgres:///runner"
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
@@ -296,7 +264,7 @@ jobs:
       PHP: "8.0"
       enable_debug: "no"
       enable_zts: "yes"
-      enable_spl: "yes"
+      PQ_DSN: "postgres:///runner"
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
@@ -331,7 +299,7 @@ jobs:
       PHP: "8.0"
       enable_debug: "yes"
       enable_zts: "no"
-      enable_spl: "yes"
+      PQ_DSN: "postgres:///runner"
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
@@ -366,7 +334,7 @@ jobs:
       PHP: "8.0"
       enable_debug: "no"
       enable_zts: "no"
-      enable_spl: "yes"
+      PQ_DSN: "postgres:///runner"
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
@@ -401,7 +369,7 @@ jobs:
       CFLAGS: "-O0 -g --coverage"
       CXXFLAGS: "-O0 -g --coverage"
       PHP: "8.0"
-      enable_spl: "yes"
+      PQ_DSN: "postgres:///runner"
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
diff --git a/scripts/gen_github_workflow_ci.php b/scripts/gen_github_workflow_ci.php
index 94c0666..4b95237 100755
--- a/scripts/gen_github_workflow_ci.php
+++ b/scripts/gen_github_workflow_ci.php
@@ -18,28 +18,21 @@ $job = $gen->github([
 	"enable_debug" => "yes",
 	"enable_maintainer_zts" => "yes",
 	"enable_json" => "yes",
-	"enable_spl" => "yes",
 ], 
 "master" => [
     "PHP" => ["master"],
     "enable_debug" => "yes",
     "enable_zts" => "yes",
-    "enable_spl" => "yes",
-], 
-"cur-none" => [
-    "PHP" => $cur,
 ], 
 "cur-dbg-zts" => [
     "PHP" => $cur,
     "enable_debug",
     "enable_zts",
-    "enable_spl" => "yes",
 ], 
 "cur-cov" => [
     "CFLAGS" => "-O0 -g --coverage",
     "CXXFLAGS" => "-O0 -g --coverage",
     "PHP" => $cur,
-    "enable_spl" => "yes",
 ]]);
 foreach ($job as $id => $env) {
     printf("  %s:\n", $id);
@@ -52,6 +45,7 @@ foreach ($job as $id => $env) {
         printf("      %s: \"%s\"\n", $key, $val);
     }
 ?>
+      PQ_DSN: "postgres:///runner"
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-- 
2.30.2