From 359f1509fa70fc572351f425451360b2ec5336bb Mon Sep 17 00:00:00 2001
From: "John J. Camilleri" <john@digitalgrammars.com>
Date: Mon, 9 Nov 2020 21:59:05 +0100
Subject: [PATCH] Blurt out cabal version in both action and build script

---
 .github/workflows/build-macos-package.yml | 6 +++++-
 bin/build-binary-dist.sh                  | 6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-macos-package.yml b/.github/workflows/build-macos-package.yml
index 6d11b8a1c..f4f0e4edb 100644
--- a/.github/workflows/build-macos-package.yml
+++ b/.github/workflows/build-macos-package.yml
@@ -9,8 +9,8 @@ jobs:
     strategy:
       matrix:
         os: [macOS-latest]
-        cabal: ["2.4"]
         ghc: ["8.6.5"]
+        cabal: ["2.4"]
 
     steps:
     - uses: actions/checkout@v2
@@ -22,6 +22,10 @@ jobs:
         ghc-version: ${{ matrix.ghc }}
         cabal-version: ${{ matrix.cabal }}
 
+    - name: Check cabal version
+      run: |
+        cabal --version
+
     - name: Install build tools
       run: |
         brew install \
diff --git a/bin/build-binary-dist.sh b/bin/build-binary-dist.sh
index 02751f40b..2c03a81a1 100755
--- a/bin/build-binary-dist.sh
+++ b/bin/build-binary-dist.sh
@@ -25,6 +25,8 @@ extra="--extra-lib-dirs=$extralib --extra-include-dirs=$extrainclude"
 set -e                             # Stop if an error occurs
 set -x                             # print commands before executing them
 
+cabal --version
+
 ## First configure & build the C run-time system
 pushd src/runtime/c
 bash setup.sh configure --prefix="$prefix"
@@ -74,7 +76,7 @@ cabal install -w "$ghc" --only-dependencies -fserver -fc-runtime $extra
 cabal configure -w "$ghc" --prefix="$prefix" -fserver -fc-runtime $extra
 cabal build
 # Building the example grammars will fail, because the RGL is missing
-cabal v1-copy --destdir="$destdir"  # create www directory
+cabal copy --destdir="$destdir"  # create www directory
 
 ## Build the RGL and copy it to $destdir
 PATH=$PWD/dist/build/gf:$PATH
@@ -89,7 +91,7 @@ popd
 cabal build
 
 ## Copy GF to $destdir
-cabal v1-copy --destdir="$destdir"
+cabal copy --destdir="$destdir"
 libdir=$(dirname $(find "$destdir" -name PGF.hi))
 cabal register --gen-pkg-config=$libdir/gf-$ver.conf