From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Fri, 24 Jun 2022 18:22:41 +0000 (-0700)
Subject: Split long workflow commands into separate lines for easier readability.
X-Git-Tag: 2.1.0-beta1~193
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c895ebffc27be1da13953bd49dbb690bce8ee2b;p=thirdparty%2Fzlib-ng.git

Split long workflow commands into separate lines for easier readability.
---

diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml
index b52c8490d..3a38edd93 100644
--- a/.github/workflows/analyze.yml
+++ b/.github/workflows/analyze.yml
@@ -13,10 +13,32 @@ jobs:
 
     - name: Generate project files
       run: |
-        cmake . -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DWITH_FUZZERS=OFF -DWITH_CODE_COVERAGE=OFF -DWITH_MAINTAINER_WARNINGS=OFF
+        cmake . \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DBUILD_SHARED_LIBS=OFF \
+          -DWITH_FUZZERS=OFF \
+          -DWITH_CODE_COVERAGE=OFF \
+          -DWITH_MAINTAINER_WARNINGS=OFF
       env:
         CC: gcc-10
-        CFLAGS: "-fanalyzer -Werror -Wanalyzer-double-fclose -Wanalyzer-double-free -Wanalyzer-exposure-through-output-file -Wanalyzer-file-leak -Wanalyzer-free-of-non-heap -Wanalyzer-malloc-leak -Wanalyzer-null-argument -Wanalyzer-null-dereference -Wanalyzer-possible-null-argument -Wanalyzer-possible-null-dereference -Wanalyzer-stale-setjmp-buffer -Wanalyzer-tainted-array-index -Wanalyzer-unsafe-call-within-signal-handler -Wanalyzer-use-after-free -Wanalyzer-use-of-pointer-in-stale-stack-frame"
+        CFLAGS:
+          -fanalyzer
+          -Werror
+          -Wanalyzer-double-fclose
+          -Wanalyzer-double-free
+          -Wanalyzer-exposure-through-output-file
+          -Wanalyzer-file-leak
+          -Wanalyzer-free-of-non-heap
+          -Wanalyzer-malloc-leak
+          -Wanalyzer-null-argument
+          -Wanalyzer-null-dereference
+          -Wanalyzer-possible-null-argument
+          -Wanalyzer-possible-null-dereference
+          -Wanalyzer-stale-setjmp-buffer
+          -Wanalyzer-tainted-array-index
+          -Wanalyzer-unsafe-call-within-signal-handler
+          -Wanalyzer-use-after-free
+          -Wanalyzer-use-of-pointer-in-stale-stack-frame
         CI: true
 
     - name: Compile source code
@@ -29,14 +51,21 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Install packages (Ubuntu)
-      run: sudo apt-get install clang-tools -y
+      run: sudo apt-get install -y clang-tools
 
     - name: Generate project files
       run: |
-        scan-build --status-bugs cmake . -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DWITH_FUZZERS=OFF -DWITH_CODE_COVERAGE=OFF -DWITH_MAINTAINER_WARNINGS=OFF
+        scan-build --status-bugs \
+          cmake . \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DBUILD_SHARED_LIBS=OFF \
+            -DWITH_FUZZERS=OFF \
+            -DWITH_CODE_COVERAGE=OFF \
+            -DWITH_MAINTAINER_WARNINGS=OFF
       env:
         CI: true
 
     - name: Compile source code
       run: |
-        scan-build --status-bugs cmake --build . --config Release > /dev/null
+        scan-build --status-bugs \
+          cmake --build . --config Release > /dev/null
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index b10a5911e..7b537f06c 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -444,22 +444,27 @@ jobs:
       if: contains(matrix.name, 'MSAN')
       run: |
         git clone --depth=1 https://github.com/llvm/llvm-project --single-branch --branch llvmorg-11.0.0
-        cd llvm-project
-        mkdir build
-        cd build
-        cmake -G Ninja ../llvm -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" -DLLVM_USE_SANITIZER=MemoryWithOrigins -DLLVM_LIBC_ENABLE_LINTING=OFF
-        cmake --build . -- cxx cxxabi
-        echo "LLVM_BUILD_DIR=`pwd`" >> $GITHUB_ENV
+        cmake -S llvm-project/llvm -B llvm-project/build -G Ninja \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" \
+          -DLLVM_USE_SANITIZER=MemoryWithOrigins \
+          -DLLVM_LIBC_ENABLE_LINTING=OFF
+        cmake --build llvm-project/build -- cxx cxxabi
+        echo "LLVM_BUILD_DIR=`pwd`/llvm-project/build" >> $GITHUB_ENV
       env:
         CC: ${{ matrix.compiler }}
         CXX: ${{ matrix.cxx-compiler }}
 
     - name: Generate project files
+      shell: bash
       # Shared libraries turned off for qemu ppc* and sparc & reduce code coverage sources
       run: |
-        mkdir ${{ matrix.build-dir || '.not-used' }}
-        cd ${{ matrix.build-dir || '.' }}
-        cmake ${{ matrix.build-src-dir || '.' }} ${{ matrix.cmake-args }} -DCMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DBUILD_SHARED_LIBS=OFF -DWITH_FUZZERS=ON ${{ matrix.codecov && '-DWITH_CODE_COVERAGE=ON' }} -DWITH_MAINTAINER_WARNINGS=ON
+        cmake -S ${{ matrix.build-src-dir || '.' }} -B ${{ matrix.build-dir || '.' }} ${{ matrix.cmake-args }} \
+          -DCMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} \
+          -DBUILD_SHARED_LIBS=OFF \
+          -DWITH_FUZZERS=ON \
+          -DWITH_MAINTAINER_WARNINGS=ON \
+          ${{ matrix.codecov && '-DWITH_CODE_COVERAGE=ON' }}
       env:
         CC: ${{ matrix.compiler }}
         CXX: ${{ matrix.cxx-compiler }}
@@ -487,7 +492,11 @@ jobs:
       shell: bash
       run: |
         python3 -u -m pip install --user gcovr==5.0
-        python3 -m gcovr --exclude-unreachable-branches --gcov-executable "${{ matrix.gcov-exec || 'gcov' }}" --root ${{ matrix.build-src-dir || '.' }} --xml --output coverage.xml -j 3 --verbose
+        python3 -m gcovr -j 3 --verbose \
+          --exclude-unreachable-branches \
+          --gcov-executable "${{ matrix.gcov-exec || 'gcov' }}" \
+          --root ${{ matrix.build-src-dir || '.' }} \
+          --xml --output coverage.xml
 
     - name: Upload coverage report
       uses: codecov/codecov-action@v2
diff --git a/.github/workflows/libpng.yml b/.github/workflows/libpng.yml
index 13326b395..9118a96c8 100644
--- a/.github/workflows/libpng.yml
+++ b/.github/workflows/libpng.yml
@@ -10,7 +10,11 @@ jobs:
 
     - name: Generate project files (zlib-ng)
       run: |
-        cmake . -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DZLIB_COMPAT=ON -DZLIB_ENABLE_TESTS=OFF
+        cmake . \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DBUILD_SHARED_LIBS=OFF \
+          -DZLIB_COMPAT=ON \
+          -DZLIB_ENABLE_TESTS=OFF
       env:
         CC: clang
         CFLAGS: -fPIC
@@ -26,7 +30,13 @@ jobs:
         path: libpng
 
     - name: Generate project files (libpng)
-      run: cmake . -DCMAKE_BUILD_TYPE=Release -DPNG_TESTS=ON -DPNG_STATIC=OFF -DZLIB_INCLUDE_DIR=.. -DZLIB_LIBRARY=$PWD/../libz.a
+      run: |
+        cmake . \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DPNG_TESTS=ON \
+          -DPNG_STATIC=OFF \
+          -DZLIB_INCLUDE_DIR=.. \
+          -DZLIB_LIBRARY=$PWD/../libz.a
       working-directory: libpng
       env:
         CC: clang
diff --git a/.github/workflows/pigz.yml b/.github/workflows/pigz.yml
index afec6e3ee..fc604200b 100644
--- a/.github/workflows/pigz.yml
+++ b/.github/workflows/pigz.yml
@@ -66,7 +66,13 @@ jobs:
         sudo apt-get install -y ${{ matrix.packages }}
 
     - name: Generate project files
-      run: cmake ${{ matrix.cmake-args }} -DCMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DBUILD_SHARED_LIBS=OFF -DZLIB_ROOT=../.. -DWITH_CODE_COVERAGE=ON -DWITH_MAINTAINER_WARNINGS=ON
+      run: |
+        cmake ${{ matrix.cmake-args }} \
+          -DCMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} \
+          -DBUILD_SHARED_LIBS=OFF \
+          -DZLIB_ROOT=../.. \
+          -DWITH_CODE_COVERAGE=ON \
+          -DWITH_MAINTAINER_WARNINGS=ON
       working-directory: test/pigz
       env:
         CC: ${{ matrix.compiler }}
@@ -86,7 +92,11 @@ jobs:
       if: matrix.codecov
       run: |
         python3 -u -m pip install --user gcovr==5.0
-        python3 -m gcovr --exclude-unreachable-branches --gcov-executable "${{ matrix.gcov-exec || 'gcov' }}" --root . --xml --output coverage.xml -j 3 --verbose
+        python3 -m gcovr -j 3 --verbose \
+          --exclude-unreachable-branches \
+          --gcov-executable "${{ matrix.gcov-exec || 'gcov' }}" \
+          --root . \
+          --xml --output coverage.xml
 
     - name: Upload coverage report
       uses: codecov/codecov-action@v2
diff --git a/.github/workflows/pkgcheck.yml b/.github/workflows/pkgcheck.yml
index 105f50a66..3b8c712c2 100644
--- a/.github/workflows/pkgcheck.yml
+++ b/.github/workflows/pkgcheck.yml
@@ -82,7 +82,10 @@ jobs:
       if: runner.os == 'Linux'
       run: |
         sudo apt-get update
-        sudo apt-get install -y --no-install-recommends abigail-tools ninja-build diffoscope ${{ matrix.packages }}
+        sudo apt-get install -y --no-install-recommends ${{ matrix.packages }} \
+          abigail-tools \
+          diffoscope \
+          ninja-build
 
     - name: Install packages (macOS)
       if: runner.os == 'macOS'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 163caa08e..2a3327b47 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -68,8 +68,13 @@ jobs:
       run:  echo "tag=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
 
     - name: Generate project files
+      shell: bash
       run: |
-        cmake . ${{ matrix.cmake-args }} -DCMAKE_BUILD_TYPE=Release -DZLIB_ENABLE_TESTS=ON -DCMAKE_INSTALL_PREFIX=out -DINSTALL_UTILS=ON
+        cmake . ${{ matrix.cmake-args }} \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DZLIB_ENABLE_TESTS=ON \
+          -DCMAKE_INSTALL_PREFIX=out \
+          -DINSTALL_UTILS=ON
       env:
         CC: ${{ matrix.compiler }}
         CI: true