From e94d3e168ba2e3f05bf75c1b29c2159bf382a6fd Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat, 22 Jul 2023 14:00:17 +0100
Subject: Cygwin: CI: Simplify and reduce the number of steps in cross-build
 job

---
 .github/workflows/cygwin.yml | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
index 9c6f352d2..8c8e78a37 100644
--- a/.github/workflows/cygwin.yml
+++ b/.github/workflows/cygwin.yml
@@ -22,33 +22,37 @@ jobs:
     - uses: actions/checkout@v3
 
     # install build tools
-    - run: dnf install -y autoconf automake make patch perl
-    - run: dnf install -y mingw${{ matrix.pkgarch }}-gcc-c++ mingw${{ matrix.pkgarch }}-winpthreads-static mingw${{ matrix.pkgarch }}-zlib-static
+    - name: Install build tools
+      run: |
+        dnf install -y autoconf automake make patch perl mingw${{ matrix.pkgarch }}-gcc-c++ mingw${{ matrix.pkgarch }}-winpthreads-static mingw${{ matrix.pkgarch }}-zlib-static
 
     # enable 'dnf copr'
-    - run: dnf install -y dnf-plugins-core
-
-    # cocom isn't packaged in Fedora, so we install from a copr
-    - run: dnf copr enable -y jturney/cocom
-    - run: dnf install -y cocom
+    - name: Enable 'dnf copr'
+      run: |
+        dnf install -y dnf-plugins-core
 
     # install cross-cygwin toolchain and libs from copr
-    - run: dnf copr enable -y yselkowitz/cygwin
-    - run: dnf install -y cygwin${{ matrix.pkgarch }}-gcc-c++ cygwin${{ matrix.pkgarch }}-gettext cygwin${{ matrix.pkgarch }}-libbfd cygwin${{ matrix.pkgarch }}-libiconv cygwin${{ matrix.pkgarch }}-zlib
+    - name: Install cross-cygwin toolchain and libs and cocom from copr
+      run: |
+        dnf copr enable -y yselkowitz/cygwin
+        dnf install -y cygwin${{ matrix.pkgarch }}-gcc-c++ cygwin${{ matrix.pkgarch }}-gettext cygwin${{ matrix.pkgarch }}-libbfd cygwin${{ matrix.pkgarch }}-libiconv cygwin${{ matrix.pkgarch }}-zlib cocom
 
     # install doc tools
-    - run: dnf install -y dblatex docbook2X docbook-xsl xmlto
-    - run: dnf install -y python3 python3-lxml python3-ply
-    - run: fmtutil-sys --byfmt pdflatex && texhash
+    - name: Install doc tools
+      run: |
+        dnf install -y dblatex docbook2X docbook-xsl xmlto python3 python3-lxml python3-ply
+        fmtutil-sys --byfmt pdflatex && texhash
 
     # build
-    - run: mkdir build install
-    - run: cd winsup && ./autogen.sh
-    - run: cd build && ../configure --target=${{ matrix.target }} --prefix=$(realpath $(pwd)/../install)
-    - run: make -C build
-    - run: make -C build/*/newlib info man
-    - run: make -C build install
-    - run: make -C build/*/newlib install-info install-man
+    - name: Configure, build and install
+      run: |
+        mkdir build install
+        (cd winsup && ./autogen.sh)
+        (cd build && ../configure --target=${{ matrix.target }} --prefix=$(realpath $(pwd)/../install) )
+        make -C build
+        make -C build/*/newlib info man
+        make -C build install
+        make -C build/*/newlib install-info install-man
 
   windows-build:
     runs-on: windows-latest
-- 
cgit v1.2.3