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.
This commit is contained in:
Jon Turney 2020-10-27 16:29:45 +00:00
parent 548a4c3ca4
commit 2d34164402
No known key found for this signature in database
GPG Key ID: C7C86F0370285C81
3 changed files with 19 additions and 6 deletions

View File

@ -1,4 +1,5 @@
version: '{build}' version: '{build}'
image: Visual Studio 2019
branches: branches:
only: only:
@ -30,6 +31,8 @@ install:
- "%CACHE%\\%SETUP% -qnNdO -R %CYGWIN_ROOT% -s %CYGWIN_MIRROR% -l %CACHE% -g -P \ - "%CACHE%\\%SETUP% -qnNdO -R %CYGWIN_ROOT% -s %CYGWIN_MIRROR% -l %CACHE% -g -P \
gcc-core,\ gcc-core,\
gcc-g++,\ gcc-g++,\
autoconf,\
automake,\
make,\ make,\
perl,\ perl,\
patch,\ patch,\
@ -40,21 +43,27 @@ zlib-devel,\
%PKGARCH%-gcc-core,\ %PKGARCH%-gcc-core,\
%PKGARCH%-gcc-g++,\ %PKGARCH%-gcc-g++,\
%PKGARCH%-zlib,\ %PKGARCH%-zlib,\
dejagnu,\
dblatex,\ dblatex,\
docbook2X,\ docbook2X,\
docbook-xml45,\ docbook-xml45,\
docbook-xsl,\ docbook-xsl,\
texlive-collection-latexrecommended,\
texlive-collection-fontsrecommended,\
texlive-collection-pictures,\
xmlto,\ xmlto,\
python3-lxml,\ python38-lxml,\
python3-ply" python38-ply"
build_script: build_script:
- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; mkdir build install"' - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; mkdir build install"'
- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; cd winsup; ./autogen.sh"'
- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER/build; ../configure --prefix=$(realpath $(pwd)/../install) -v"' - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER/build; ../configure --prefix=$(realpath $(pwd)/../install) -v"'
- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER/build; make"' - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER/build; make"'
- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER/build; make install"' - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER/build; make install"'
- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER/build; cd */newlib; make info man"' - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER/build; cd */newlib; make info man"'
- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER/build; cd */newlib; make install-info install-man"' - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER/build; cd */newlib; make install-info install-man"'
- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER/build; cd */winsup; make check || true"'
test: off test: off
deploy: off deploy: off

View File

@ -20,15 +20,17 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
# install build tools # 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 - 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 # enable 'dnf copr'
- run: dnf install -y https://github.com/rpmsphere/noarch/raw/master/r/rpmsphere-release-$(rpm -E %fedora)-1.noarch.rpm - 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 - run: dnf install -y cocom
# install cross-cygwin toolchain and libs from copr # install cross-cygwin toolchain and libs from copr
- run: dnf install -y dnf-plugins-core
- run: dnf copr enable -y yselkowitz/cygwin - 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 - 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 # build
- run: mkdir build install - run: mkdir build install
- run: cd winsup && ./autogen.sh
- run: cd build && ../configure --target=${{ matrix.target }} --prefix=$(realpath $(pwd)/../install) - run: cd build && ../configure --target=${{ matrix.target }} --prefix=$(realpath $(pwd)/../install)
- run: make -C build - run: make -C build
- run: make -C build/*/newlib info man - run: make -C build/*/newlib info man

View File

@ -1,3 +1,4 @@
set -e
/usr/bin/aclocal --force /usr/bin/aclocal --force
/usr/bin/autoconf -f /usr/bin/autoconf -f
/usr/bin/automake -ac /usr/bin/automake -ac