gh-actions: ci: fix yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0221ad8655275e73a2bc84d7a3d7ac9cdcfa1f8f..5df865283131fa1f24147f2e2e5eb34821dd5046 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,9 +15,11 @@ jobs:
       enable_debug: yes
       enable_zts: yes
       enable_iconv: yes
       enable_debug: yes
       enable_zts: yes
       enable_iconv: yes

+    runs-on: ubuntu-20.04

     steps:
       - uses: actions/checkout@v2
     steps:
       - uses: actions/checkout@v2

-        submodules: true
+        with:
+          submodules: true

       - name: Install
         run: |
           sudo apt-get install -y \
       - 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
       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
     steps:
       - uses: actions/checkout@v2

-        submodules: true
+        with:
+          submodules: true

       - name: Install
         run: |
           sudo apt-get install -y \
       - name: Install
         run: |
           sudo apt-get install -y \


@@ -82,9 +86,11 @@ jobs:
       enable_debug: yes
       enable_zts: yes
       enable_iconv: yes
       enable_debug: yes
       enable_zts: yes
       enable_iconv: yes

+    runs-on: ubuntu-20.04

     steps:
       - uses: actions/checkout@v2
     steps:
       - uses: actions/checkout@v2

-        submodules: true
+        with:
+          submodules: true

       - name: Install
         run: |
           sudo apt-get install -y \
       - name: Install
         run: |
           sudo apt-get install -y \


@@ -114,9 +120,11 @@ jobs:
       enable_debug: no
       enable_zts: yes
       enable_iconv: yes
       enable_debug: no
       enable_zts: yes
       enable_iconv: yes

+    runs-on: ubuntu-20.04

     steps:
       - uses: actions/checkout@v2
     steps:
       - uses: actions/checkout@v2

-        submodules: true
+        with:
+          submodules: true

       - name: Install
         run: |
           sudo apt-get install -y \
       - name: Install
         run: |
           sudo apt-get install -y \


@@ -146,9 +154,11 @@ jobs:
       enable_debug: yes
       enable_zts: no
       enable_iconv: yes
       enable_debug: yes
       enable_zts: no
       enable_iconv: yes

+    runs-on: ubuntu-20.04

     steps:
       - uses: actions/checkout@v2
     steps:
       - uses: actions/checkout@v2

-        submodules: true
+        with:
+          submodules: true

       - name: Install
         run: |
           sudo apt-get install -y \
       - name: Install
         run: |
           sudo apt-get install -y \


@@ -178,9 +188,11 @@ jobs:
       enable_debug: no
       enable_zts: no
       enable_iconv: yes
       enable_debug: no
       enable_zts: no
       enable_iconv: yes

+    runs-on: ubuntu-20.04

     steps:
       - uses: actions/checkout@v2
     steps:
       - uses: actions/checkout@v2

-        submodules: true
+        with:
+          submodules: true

       - name: Install
         run: |
           sudo apt-get install -y \
       - 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
       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
     steps:
       - uses: actions/checkout@v2

-        submodules: true
+        with:
+          submodules: true

       - name: Install
         run: |
           sudo apt-get install -y \
       - 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
       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
     steps:
       - uses: actions/checkout@v2

-        submodules: true
+        with:
+          submodules: true

       - name: Install
         run: |
           sudo apt-get install -y \
       - 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
       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
     steps:
       - uses: actions/checkout@v2

-        submodules: true
+        with:
+          submodules: true

       - name: Install
         run: |
           sudo apt-get install -y \
       - 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 7cb18f255fc7293cb2555e3ee03dd1f8d6ffe86f..3b927ea4c6c5e9cac324e617b0dfffdf565926f7 100755 (executable)
--- 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);
     }
 ?>
         printf("      %s: %s\n", $key, $val);
     }
 ?>

+    runs-on: ubuntu-20.04

     steps:
       - uses: actions/checkout@v2
     steps:
       - uses: actions/checkout@v2

-        submodules: true
+        with:
+          submodules: true

       - name: Install
         run: |
           sudo apt-get install -y \
       - name: Install
         run: |
           sudo apt-get install -y \