From 2d3416440213e1208ed665558e5eda765cb5f061 Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue, 27 Oct 2020 16:29:45 +0000
Subject: Cygwin: CI configuration update

Install autoconf and automake, and run winsup/autogen.sh, and don't have
it silently ignore failures.

On AppVeyor:
- use latest VM image, to reduce time spent installing updates.
- run the testsuite, but ignore the result, as some tests don't work
correctly.
- hardcode the python-lxml and python-ply packages to install, so we get
ones for the right python.
- install texlive collections now needed to build documentation.

On github:
- Use a copr for cocom, since RPMSphere's package updates don't track
fedora:latest very efficently.
---
 .github/workflows/cygwin.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
index cdad8e67b..f9a9a7ae5 100644
--- a/.github/workflows/cygwin.yml
+++ b/.github/workflows/cygwin.yml
@@ -20,15 +20,17 @@ jobs:
     - uses: actions/checkout@v2
 
     # install build tools
-    - run: dnf install -y make patch perl
+    - 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
 
-    # cocom isn't packaged in Fedora, so we install from a 3rd party repo
-    - run: dnf install -y https://github.com/rpmsphere/noarch/raw/master/r/rpmsphere-release-$(rpm -E %fedora)-1.noarch.rpm
+    # 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
 
     # install cross-cygwin toolchain and libs from copr
-    - run: dnf install -y dnf-plugins-core
     - 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
 
@@ -38,6 +40,7 @@ jobs:
 
     # 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
-- 
cgit v1.2.3