From ae49f4d933400356fa8f59004b7bb71729f12ef5 Mon Sep 17 00:00:00 2001 From: David Schweikert Date: Sun, 6 Feb 2022 13:55:40 +0100 Subject: [PATCH] Update autotools and fix code coverage issues. --- .github/workflows/test.yml | 3 +++ ci/build-1-autotools.sh | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b6bbeff..ec22307 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,9 @@ jobs: - name: Build run: | + ci/build-1-autotools.sh ci/build-4-compile.sh + ci/test-tarball.sh - name: Test run: | @@ -68,6 +70,7 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} path-to-lcov: lcov.info flag-name: macos + parallel: true Coveralls-Finish: needs: [Test-Linux, Test-Mac] diff --git a/ci/build-1-autotools.sh b/ci/build-1-autotools.sh index a272f59..f0ea2e0 100755 --- a/ci/build-1-autotools.sh +++ b/ci/build-1-autotools.sh @@ -1,12 +1,15 @@ -#!/bin/bash -e +#!/bin/bash + +set -e +set -x if [[ "$OSTYPE" == "darwin"* ]]; then exit 0 fi -AUTOCONF=http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz -AUTOMAKE=http://ftp.gnu.org/gnu/automake/automake-1.14.1.tar.gz -LIBTOOL=http://alpha.gnu.org/gnu/libtool/libtool-2.4.2.418.tar.gz +AUTOCONF=http://ftp.gnu.org/gnu/autoconf/autoconf-2.71.tar.gz +AUTOMAKE=http://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.gz +LIBTOOL=http://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.gz PREFIX=$(pwd)/ci/build PATH=$(pwd)/ci/build/bin:$PATH