From 96bb85e8a89faad9009afd8be9ee439bc7f48ce1 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Tue, 12 Jan 2021 17:59:05 +0100
Subject: [PATCH 1/1] gh-actions: ci: fix yml

---
 .github/workflows/ci.yml           | 36 ++++++++++++++++++++++--------
 scripts/gen_github_workflow_ci.php |  4 +++-
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0221ad8..5df8652 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,9 +15,11 @@ jobs:
       enable_debug: yes
       enable_zts: yes
       enable_iconv: yes
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-        submodules: true
+        with:
+          submodules: true
       - name: Install
         run: |
           sudo apt-get install -y \
@@ -50,9 +52,11 @@ jobs:
       with_http_libcurl_dir: no
       with_http_libevent_dir: no
       with_http_libbrotli_dir: no
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-        submodules: true
+        with:
+          submodules: true
       - name: Install
         run: |
           sudo apt-get install -y \
@@ -82,9 +86,11 @@ jobs:
       enable_debug: yes
       enable_zts: yes
       enable_iconv: yes
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-        submodules: true
+        with:
+          submodules: true
       - name: Install
         run: |
           sudo apt-get install -y \
@@ -114,9 +120,11 @@ jobs:
       enable_debug: no
       enable_zts: yes
       enable_iconv: yes
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-        submodules: true
+        with:
+          submodules: true
       - name: Install
         run: |
           sudo apt-get install -y \
@@ -146,9 +154,11 @@ jobs:
       enable_debug: yes
       enable_zts: no
       enable_iconv: yes
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-        submodules: true
+        with:
+          submodules: true
       - name: Install
         run: |
           sudo apt-get install -y \
@@ -178,9 +188,11 @@ jobs:
       enable_debug: no
       enable_zts: no
       enable_iconv: yes
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-        submodules: true
+        with:
+          submodules: true
       - name: Install
         run: |
           sudo apt-get install -y \
@@ -213,9 +225,11 @@ jobs:
       with_http_libicu_dir: yes
       with_http_libidn_dir: no
       with_http_libidn2_dir: no
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-        submodules: true
+        with:
+          submodules: true
       - name: Install
         run: |
           sudo apt-get install -y \
@@ -253,9 +267,11 @@ jobs:
       with_http_libicu_dir: no
       with_http_libidn_dir: yes
       with_http_libidn2_dir: no
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-        submodules: true
+        with:
+          submodules: true
       - name: Install
         run: |
           sudo apt-get install -y \
@@ -293,9 +309,11 @@ jobs:
       with_http_libicu_dir: no
       with_http_libidn_dir: no
       with_http_libidn2_dir: yes
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-        submodules: true
+        with:
+          submodules: true
       - name: Install
         run: |
           sudo apt-get install -y \
diff --git a/scripts/gen_github_workflow_ci.php b/scripts/gen_github_workflow_ci.php
index 7cb18f2..3b927ea 100755
--- a/scripts/gen_github_workflow_ci.php
+++ b/scripts/gen_github_workflow_ci.php
@@ -61,9 +61,11 @@ foreach ($job as $id => $env) {
         printf("      %s: %s\n", $key, $val);
     }
 ?>
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-        submodules: true
+        with:
+          submodules: true
       - name: Install
         run: |
           sudo apt-get install -y \
-- 
2.30.2