From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Sun, 19 Jun 2022 20:17:02 +0000 (-0700)
Subject: Collapse workflow multiline run actions into single line.
X-Git-Tag: 2.1.0-beta1~197
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4047895706e5fc08cba3c5985c4593de6ee69e5;p=thirdparty%2Fzlib-ng.git

Collapse workflow multiline run actions into single line.
---

diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml
index 31d9ff991..b52c8490d 100644
--- a/.github/workflows/analyze.yml
+++ b/.github/workflows/analyze.yml
@@ -9,8 +9,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Install packages (Ubuntu)
-      run: |
-        sudo apt-get install -y gcc-10
+      run: sudo apt-get install -y gcc-10
 
     - name: Generate project files
       run: |
@@ -21,8 +20,7 @@ jobs:
         CI: true
 
     - name: Compile source code
-      run: |
-        cmake --build . --config Release > /dev/null
+      run: cmake --build . --config Release > /dev/null
 
   Clang:
     runs-on: ubuntu-latest
@@ -31,8 +29,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Install packages (Ubuntu)
-      run: |
-        sudo apt-get install clang-tools -y
+      run: sudo apt-get install clang-tools -y
 
     - name: Generate project files
       run: |
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index c97fd0deb..dcdfee240 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -413,8 +413,7 @@ jobs:
 
     - name: Add repositories (Wine)
       if: contains(matrix.packages, 'wine')
-      run: |
-        sudo dpkg --add-architecture i386
+      run: sudo dpkg --add-architecture i386
 
     - name: Install packages (Ubuntu)
       if: runner.os == 'Linux' && matrix.packages
@@ -427,21 +426,19 @@ jobs:
       run: |
         # strawberryperl installs /c/Strawberry/c/bin/libstdc++-6.dll, which is incompatible with the mingw64 one.
         # zlib-ng does not need perl, so simply remove it.
-        choco uninstall strawberryperl --no-progress
-        choco install ninja ${{ matrix.packages }} --no-progress
+        choco uninstall --no-progress strawberryperl
+        choco install --no-progress ninja ${{ matrix.packages }}
 
     - name: Install packages (macOS)
       if: runner.os == 'macOS'
-      run: |
-        brew install ninja ${{ matrix.packages }}
+      run: brew install ninja ${{ matrix.packages }}
       env:
         HOMEBREW_NO_INSTALL_CLEANUP: 1
 
     - name: Initialize Wine
       # Prevent parallel test jobs from initializing Wine at the same time
       if: contains(matrix.packages, 'wine')
-      run: |
-        wineboot --init
+      run: wineboot --init
 
     - name: Compile LLVM C++ libraries (MSAN)
       if: contains(matrix.name, 'MSAN')
diff --git a/.github/workflows/libpng.yml b/.github/workflows/libpng.yml
index 6af5ed00e..f25f16865 100644
--- a/.github/workflows/libpng.yml
+++ b/.github/workflows/libpng.yml
@@ -17,8 +17,7 @@ jobs:
         CI: true
 
     - name: Compile source code (zlib-ng)
-      run: |
-        cmake --build . --config Release
+      run: cmake --build . --config Release
 
     - name: Checkout repository (libpng)
       uses: actions/checkout@v3
diff --git a/.github/workflows/pkgcheck.yml b/.github/workflows/pkgcheck.yml
index 9511af995..105f50a66 100644
--- a/.github/workflows/pkgcheck.yml
+++ b/.github/workflows/pkgcheck.yml
@@ -86,8 +86,7 @@ jobs:
 
     - name: Install packages (macOS)
       if: runner.os == 'macOS'
-      run: |
-        brew install ninja diffoscope ${{ matrix.packages }}
+      run: brew install ninja diffoscope ${{ matrix.packages }}
       env:
         HOMEBREW_NO_INSTALL_CLEANUP: 1
 
@@ -101,8 +100,7 @@ jobs:
         xcode-version: '11.7.0'
 
     - name: Compare builds
-      run: |
-        sh test/pkgcheck.sh
+      run: sh test/pkgcheck.sh
       env:
         CC: ${{ matrix.compiler }}
         CXX: ${{ matrix.cxx-compiler }}
@@ -114,8 +112,7 @@ jobs:
         LDFLAGS: ${{ matrix.ldflags }}
 
     - name: Compare builds (compat)
-      run: |
-        sh test/pkgcheck.sh --zlib-compat
+      run: sh test/pkgcheck.sh --zlib-compat
       env:
         CC: ${{ matrix.compiler }}
         CFLAGS: ${{ matrix.cflags }}
@@ -127,8 +124,7 @@ jobs:
     - name: Check ABI
       # macOS runner does not contain abigail
       if: runner.os != 'macOS'
-      run: |
-        sh test/abicheck.sh --refresh-if
+      run: sh test/abicheck.sh --refresh-if
       env:
         CC: ${{ matrix.compiler }}
         CXX: ${{ matrix.cxx-compiler }}
@@ -142,8 +138,7 @@ jobs:
     - name: Check ABI (compat)
       # macOS runner does not contain abigail
       if: runner.os != 'macOS'
-      run: |
-        sh test/abicheck.sh --zlib-compat --refresh-if
+      run: sh test/abicheck.sh --zlib-compat --refresh-if
       env:
         CC: ${{ matrix.compiler }}
         CXX: ${{ matrix.cxx-compiler }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a84051c1c..63649fda4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -75,8 +75,7 @@ jobs:
         CI: true
 
     - name: Compile source code
-      run: |
-        cmake --build . --config Release --target install
+      run: cmake --build . --config Release --target install
 
     - name: Package release (Windows)
       if: runner.os == 'Windows'