From a19d08aa01116c2249b5fb343c9cc560c6d8b889 Mon Sep 17 00:00:00 2001 From: Tamar Christina Date: Tue, 27 Jul 2021 18:22:51 +0100 Subject: [PATCH 1/3] downgrade autoconf to 2.69 Workaround for #502 --- .github/workflows/haskell.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index adf697dd..b39cfcbc 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -66,6 +66,14 @@ jobs: - if: matrix.os == 'windows-latest' shell: msys2 {0} run: autoreconf -i + # Temporary hack to get around #502 while cabal is fixed. + # Force autoconf to 2.69, remove when cabal fixed. + - if: matrix.os == 'windows-latest' + shell: msys2 {0} + run: | + pacman -R autoconf + wget http://repo.msys2.org/msys/x86_64/autoconf-2.69-5-any.pkg.tar.xz + pacman -U autoconf-2.69-5-any.pkg.tar.xz - if: matrix.os != 'windows-latest' run: | autoreconf -i From 5ffe1e7ff45b979c094e01462a7c64d2821ae2cf Mon Sep 17 00:00:00 2001 From: Tamar Christina Date: Tue, 27 Jul 2021 18:58:37 +0100 Subject: [PATCH 2/3] don't confirm changes --- .github/workflows/haskell.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index b39cfcbc..b263496e 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -71,9 +71,9 @@ jobs: - if: matrix.os == 'windows-latest' shell: msys2 {0} run: | - pacman -R autoconf + pacman -R --noconfirm autoconf wget http://repo.msys2.org/msys/x86_64/autoconf-2.69-5-any.pkg.tar.xz - pacman -U autoconf-2.69-5-any.pkg.tar.xz + pacman -U --noconfirm autoconf-2.69-5-any.pkg.tar.xz - if: matrix.os != 'windows-latest' run: | autoreconf -i From e6f64101943fc3d9c88f7cbf51b1ba420a7fa13f Mon Sep 17 00:00:00 2001 From: Tamar Christina Date: Wed, 28 Jul 2021 12:04:39 +0100 Subject: [PATCH 3/3] set env variables instead --- .github/workflows/haskell.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index b263496e..e5bc4a10 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -63,17 +63,14 @@ jobs: with: update: true install: autoconf + # Temporary hack to get around #502 while cabal is fixed. + # remove when cabal fixed. - if: matrix.os == 'windows-latest' shell: msys2 {0} - run: autoreconf -i - # Temporary hack to get around #502 while cabal is fixed. - # Force autoconf to 2.69, remove when cabal fixed. + run: echo 'PATH_SEPARATOR=";"' >> $GITHUB_ENV - if: matrix.os == 'windows-latest' shell: msys2 {0} - run: | - pacman -R --noconfirm autoconf - wget http://repo.msys2.org/msys/x86_64/autoconf-2.69-5-any.pkg.tar.xz - pacman -U --noconfirm autoconf-2.69-5-any.pkg.tar.xz + run: autoreconf -i - if: matrix.os != 'windows-latest' run: | autoreconf -i