From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id D994638582A3; Sun, 3 Sep 2023 13:58:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D994638582A3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1693749512; bh=duwqD2T97Gj3kwktMHLA3pGLSfr5UFAhW4MPhd+J5Ig=; h=From:To:Subject:Date:From; b=ZNNzv0wN3vwMF1cEbjyPGZOBj/gGSbA+cuna/bQK+OoL+qpbAj/AnH/yLi5RTCKiR b5LyDfDvFwsDuGTVUUsdugD1JWLHg6BhOMjQ6pkHptP+ICVLl97mOPSFMCN6d1UmXs HCiH+Qnfq7N5EnZQfkcxOqPYMfrh7r9+tlaIejBM= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Jon Turney To: cygwin-cvs@sourceware.org, newlib-cvs@sourceware.org Subject: [newlib-cygwin/main] Cygwin: CI: Simplify and reduce the number of steps in cross-build job X-Act-Checkin: newlib-cygwin X-Git-Author: Jon Turney X-Git-Refname: refs/heads/main X-Git-Oldrev: 1db6fb03e7b78c7201653e55e9eb27d4c2935967 X-Git-Newrev: e94d3e168ba2e3f05bf75c1b29c2159bf382a6fd Message-Id: <20230903135832.D994638582A3@sourceware.org> Date: Sun, 3 Sep 2023 13:58:32 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3De94d3e168ba= 2e3f05bf75c1b29c2159bf382a6fd commit e94d3e168ba2e3f05bf75c1b29c2159bf382a6fd Author: Jon Turney Date: Sat Jul 22 14:00:17 2023 +0100 Cygwin: CI: Simplify and reduce the number of steps in cross-build job Diff: --- .github/workflows/cygwin.yml | 42 +++++++++++++++++++++++-----------------= -- 1 file changed, 23 insertions(+), 19 deletions(-) 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 =20 # install build tools - - run: dnf install -y autoconf automake make patch perl - - run: dnf install -y mingw${{ matrix.pkgarch }}-gcc-c++ mingw${{ matr= ix.pkgarch }}-winpthreads-static mingw${{ matrix.pkgarch }}-zlib-static + - name: Install build tools + run: | + dnf install -y autoconf automake make patch perl mingw${{ matrix.p= kgarch }}-gcc-c++ mingw${{ matrix.pkgarch }}-winpthreads-static mingw${{ ma= trix.pkgarch }}-zlib-static =20 # 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 =20 # 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${{ ma= trix.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${{ matri= x.pkgarch }}-gettext cygwin${{ matrix.pkgarch }}-libbfd cygwin${{ matrix.pk= garch }}-libiconv cygwin${{ matrix.pkgarch }}-zlib cocom =20 # 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 =20 # build - - run: mkdir build install - - run: cd winsup && ./autogen.sh - - run: cd build && ../configure --target=3D${{ matrix.target }} --pref= ix=3D$(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=3D${{ matrix.target }} --prefix= =3D$(realpath $(pwd)/../install) ) + make -C build + make -C build/*/newlib info man + make -C build install + make -C build/*/newlib install-info install-man =20 windows-build: runs-on: windows-latest