From 535d72acf1ce7cae403fd05189d5b0e141b4bad3 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 2 Oct 2020 10:10:58 +0200
Subject: [PATCH] fix multiple run defs

---
 .github/workflows/cmake-build-ci.gen | 12 ++--
 .github/workflows/cmake-build-ci.yml | 85 ++++++++++++++++------------
 2 files changed, 54 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index 9dcbf069..6b7a35a0 100755
--- a/.github/workflows/cmake-build-ci.gen
+++ b/.github/workflows/cmake-build-ci.gen
@@ -89,14 +89,15 @@ function steps($splat_map = null) {
 ?>
 <?=PRE?> - name: Prepare environment (<?= "for $cc_ver $cc_vnd on $os_ver" ?>)
 <?=PRE?>   if: (<?="$os_is=='$os_ver') && ($cc_vnd_is=='$cc_vnd') && ($cc_ver_is=='$cc_ver'"?>)
-<?=PRE?>   run: echo CC=<?=DEF[$cc_vnd]["CC"] . $ver?> >> ${GITHUB_ENV}
-<?=PRE?>   run: echo CXX=<?=DEF[$cc_vnd]["CXX"] . $ver?> >> ${GITHUB_ENV}
+<?=PRE?>   run: |
+<?=PRE?>     echo CC=<?=DEF[$cc_vnd]["CC"] . $ver?> >> ${GITHUB_ENV}
+<?=PRE?>     echo CXX=<?=DEF[$cc_vnd]["CXX"] . $ver?> >> ${GITHUB_ENV}
 <?php
                 if (isset(APT[$os_ver][$cc_vnd][$cc_ver])) {
                   $dep = APT[$os_ver][$cc_vnd][$cc_ver];
 ?>
-<?=PRE?>   run: echo INSTALL_CC='<?=$dep["CC"]?>' >> ${GITHUB_ENV}
-<?=PRE?>   run: echo INSTALL_CXX='<?=$dep["CXX"]?>' >> ${GITHUB_ENV}
+<?=PRE?>     echo INSTALL_CC='<?=$dep["CC"]?>' >> ${GITHUB_ENV}
+<?=PRE?>     echo INSTALL_CXX='<?=$dep["CXX"]?>' >> ${GITHUB_ENV}
 <?php
                 }
               }
@@ -111,7 +112,6 @@ function steps($splat_map = null) {
 <?=PRE?>   if: runner.os == 'Linux'
 <?=PRE?>   run: sudo apt-get install libevent-dev libsasl-dev ${INSTALL_MEMCACHED} ${INSTALL_CC} ${INSTALL_CXX}
 <?=PRE?> - name: Generate build tree (${CMAKE_CONFIG_TYPE})
-<?=PRE?>   run: mkdir build
 <?=PRE?>   run: cmake -S . -B build
 <?=PRE?> - name: Build all with ${CXX} ${CXXFLAGS}
 <?=PRE?>   run: make -C build -j2 all
@@ -217,5 +217,5 @@ jobs:
           make -j2
           make install
           cd ..
-      <?php steps(); ?>
+<?php steps(); ?>
 
diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml
index 43d69885..6a1a3ba4 100644
--- a/.github/workflows/cmake-build-ci.yml
+++ b/.github/workflows/cmake-build-ci.yml
@@ -44,59 +44,70 @@ jobs:
       - uses: actions/checkout@v2
       - name: Prepare environment (for new gnu on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='gnu') && (env.CC_VER=='new')
-        run: echo CC=gcc-10 >> ${GITHUB_ENV}
-        run: echo CXX=g++-10 >> ${GITHUB_ENV}
-        run: echo INSTALL_CC='gcc-10' >> ${GITHUB_ENV}
-        run: echo INSTALL_CXX='g++-10' >> ${GITHUB_ENV}
+        run: |
+          echo CC=gcc-10 >> ${GITHUB_ENV}
+          echo CXX=g++-10 >> ${GITHUB_ENV}
+          echo INSTALL_CC='gcc-10' >> ${GITHUB_ENV}
+          echo INSTALL_CXX='g++-10' >> ${GITHUB_ENV}
       - name: Prepare environment (for cur gnu on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='gnu') && (env.CC_VER=='cur')
-        run: echo CC=gcc-9 >> ${GITHUB_ENV}
-        run: echo CXX=g++-9 >> ${GITHUB_ENV}
+        run: |
+          echo CC=gcc-9 >> ${GITHUB_ENV}
+          echo CXX=g++-9 >> ${GITHUB_ENV}
       - name: Prepare environment (for old gnu on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='gnu') && (env.CC_VER=='old')
-        run: echo CC=gcc-8 >> ${GITHUB_ENV}
-        run: echo CXX=g++-8 >> ${GITHUB_ENV}
+        run: |
+          echo CC=gcc-8 >> ${GITHUB_ENV}
+          echo CXX=g++-8 >> ${GITHUB_ENV}
       - name: Prepare environment (for new clang on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='clang') && (env.CC_VER=='new')
-        run: echo CC=clang-10 >> ${GITHUB_ENV}
-        run: echo CXX=clang++-10 >> ${GITHUB_ENV}
+        run: |
+          echo CC=clang-10 >> ${GITHUB_ENV}
+          echo CXX=clang++-10 >> ${GITHUB_ENV}
       - name: Prepare environment (for cur clang on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='clang') && (env.CC_VER=='cur')
-        run: echo CC=clang-9 >> ${GITHUB_ENV}
-        run: echo CXX=clang++-9 >> ${GITHUB_ENV}
+        run: |
+          echo CC=clang-9 >> ${GITHUB_ENV}
+          echo CXX=clang++-9 >> ${GITHUB_ENV}
       - name: Prepare environment (for old clang on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='clang') && (env.CC_VER=='old')
-        run: echo CC=clang-8 >> ${GITHUB_ENV}
-        run: echo CXX=clang++-8 >> ${GITHUB_ENV}
+        run: |
+          echo CC=clang-8 >> ${GITHUB_ENV}
+          echo CXX=clang++-8 >> ${GITHUB_ENV}
       - name: Prepare environment (for new gnu on ubuntu-18.04)
         if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='gnu') && (env.CC_VER=='new')
-        run: echo CC=gcc-9 >> ${GITHUB_ENV}
-        run: echo CXX=g++-9 >> ${GITHUB_ENV}
+        run: |
+          echo CC=gcc-9 >> ${GITHUB_ENV}
+          echo CXX=g++-9 >> ${GITHUB_ENV}
       - name: Prepare environment (for cur gnu on ubuntu-18.04)
         if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='gnu') && (env.CC_VER=='cur')
-        run: echo CC=gcc-8 >> ${GITHUB_ENV}
-        run: echo CXX=g++-8 >> ${GITHUB_ENV}
+        run: |
+          echo CC=gcc-8 >> ${GITHUB_ENV}
+          echo CXX=g++-8 >> ${GITHUB_ENV}
       - name: Prepare environment (for old gnu on ubuntu-18.04)
         if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='gnu') && (env.CC_VER=='old')
-        run: echo CC=gcc-7 >> ${GITHUB_ENV}
-        run: echo CXX=g++-7 >> ${GITHUB_ENV}
+        run: |
+          echo CC=gcc-7 >> ${GITHUB_ENV}
+          echo CXX=g++-7 >> ${GITHUB_ENV}
       - name: Prepare environment (for new clang on ubuntu-18.04)
         if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='clang') && (env.CC_VER=='new')
-        run: echo CC=clang-9 >> ${GITHUB_ENV}
-        run: echo CXX=clang++-9 >> ${GITHUB_ENV}
+        run: |
+          echo CC=clang-9 >> ${GITHUB_ENV}
+          echo CXX=clang++-9 >> ${GITHUB_ENV}
       - name: Prepare environment (for cur clang on ubuntu-18.04)
         if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='clang') && (env.CC_VER=='cur')
-        run: echo CC=clang-8 >> ${GITHUB_ENV}
-        run: echo CXX=clang++-8 >> ${GITHUB_ENV}
+        run: |
+          echo CC=clang-8 >> ${GITHUB_ENV}
+          echo CXX=clang++-8 >> ${GITHUB_ENV}
       - name: Prepare environment (for old clang on ubuntu-18.04)
         if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='clang') && (env.CC_VER=='old')
-        run: echo CC=clang-6.0 >> ${GITHUB_ENV}
-        run: echo CXX=clang++-6.0 >> ${GITHUB_ENV}
+        run: |
+          echo CC=clang-6.0 >> ${GITHUB_ENV}
+          echo CXX=clang++-6.0 >> ${GITHUB_ENV}
       - name: Install dependencies
         if: runner.os == 'Linux'
         run: sudo apt-get install libevent-dev libsasl-dev ${INSTALL_MEMCACHED} ${INSTALL_CC} ${INSTALL_CXX}
       - name: Generate build tree (${CMAKE_CONFIG_TYPE})
-        run: mkdir build
         run: cmake -S . -B build
       - name: Build all with ${CXX} ${CXXFLAGS}
         run: make -C build -j2 all
@@ -117,13 +128,13 @@ jobs:
       - uses: actions/checkout@v2
       - name: Prepare environment (for cur gnu on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='gnu') && (env.CC_VER=='cur')
-        run: echo CC=gcc-9 >> ${GITHUB_ENV}
-        run: echo CXX=g++-9 >> ${GITHUB_ENV}
+        run: |
+          echo CC=gcc-9 >> ${GITHUB_ENV}
+          echo CXX=g++-9 >> ${GITHUB_ENV}
       - name: Install dependencies
         if: runner.os == 'Linux'
         run: sudo apt-get install libevent-dev libsasl-dev ${INSTALL_MEMCACHED} ${INSTALL_CC} ${INSTALL_CXX}
       - name: Generate build tree (${CMAKE_CONFIG_TYPE})
-        run: mkdir build
         run: cmake -S . -B build
       - name: Build all with ${CXX} ${CXXFLAGS}
         run: make -C build -j2 all
@@ -145,13 +156,13 @@ jobs:
       - uses: actions/checkout@v2
       - name: Prepare environment (for cur gnu on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='gnu') && (env.CC_VER=='cur')
-        run: echo CC=gcc-9 >> ${GITHUB_ENV}
-        run: echo CXX=g++-9 >> ${GITHUB_ENV}
+        run: |
+          echo CC=gcc-9 >> ${GITHUB_ENV}
+          echo CXX=g++-9 >> ${GITHUB_ENV}
       - name: Install dependencies
         if: runner.os == 'Linux'
         run: sudo apt-get install libevent-dev libsasl-dev ${INSTALL_MEMCACHED} ${INSTALL_CC} ${INSTALL_CXX}
       - name: Generate build tree (${CMAKE_CONFIG_TYPE})
-        run: mkdir build
         run: cmake -S . -B build
       - name: Build all with ${CXX} ${CXXFLAGS}
         run: make -C build -j2 all
@@ -190,15 +201,15 @@ jobs:
           make -j2
           make install
           cd ..
-            - name: Prepare environment (for cur gnu on ubuntu-20.04)
+      - name: Prepare environment (for cur gnu on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='gnu') && (env.CC_VER=='cur')
-        run: echo CC=gcc-9 >> ${GITHUB_ENV}
-        run: echo CXX=g++-9 >> ${GITHUB_ENV}
+        run: |
+          echo CC=gcc-9 >> ${GITHUB_ENV}
+          echo CXX=g++-9 >> ${GITHUB_ENV}
       - name: Install dependencies
         if: runner.os == 'Linux'
         run: sudo apt-get install libevent-dev libsasl-dev ${INSTALL_MEMCACHED} ${INSTALL_CC} ${INSTALL_CXX}
       - name: Generate build tree (${CMAKE_CONFIG_TYPE})
-        run: mkdir build
         run: cmake -S . -B build
       - name: Build all with ${CXX} ${CXXFLAGS}
         run: make -C build -j2 all
-- 
2.30.2