Add macOS to Github Actions

3 files changed, 22 insertions, 35 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
index 375c8f5..0dd305c 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -6,7 +6,6 @@ environment:
     CONFIGURE_FLAGS: --with-hunspell-dir=/mingw64/share/hunspell
     VERBOSE: 1 # Get test logs in output
   matrix:
-    - APPVEYOR_BUILD_WORKER_IMAGE: macos
     # MSYS does not have hunspell packages
     # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     #   MSYSTEM: MSYS
@@ -19,23 +18,6 @@ for:
 -
   matrix:
     only:
-      - APPVEYOR_BUILD_WORKER_IMAGE: macos
-  init:
-    # Note: aspell should work on macOS, but has been removed because one of
-    # the tests fails; see https://github.com/GNUAspell/aspell/issues/555
-    - brew install glib dbus-glib hspell hunspell libvoikko unittest-cpp
-  environment:
-    LDFLAGS: "-L/usr/local/opt/flex/lib -L/usr/local/opt/texinfo/lib"
-    CPPFLAGS: "-I/usr/local/opt/flex/include"
-    PYTHON: /usr/local/bin/python3
-  build_script:
-    # Prepend optional brew binary directories to PATH
-    # Also prepend /usr/local/bin to work around https://github.com/appveyor/ci/issues/3326
-    - export PATH="/usr/local/opt/flex/bin:/usr/local/opt/m4/bin:/usr/local/opt/texinfo/bin:/usr/local/opt/gettext/bin:/usr/local/opt/cython/bin:/usr/local/bin:$PATH"
-    - ./build-aux/appveyor-build.sh
--
-  matrix:
-    only:
       - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
   init:
     - git config --global core.autocrlf input
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index f54f379..d156588 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -37,3 +37,25 @@ jobs:
     - name: make distcheck
       # normal build is with ASAN, distcheck is without ASAN. Both are covered.
       run: make distcheck --jobs=`nproc`
+
+  build-macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+      with: { submodules: true }
+    - name: Install dependencies
+      run: |
+        brew tap nuspell/nuspell
+        brew install automake dbus-glib hspell hunspell libvoikko unittest-cpp nuspell coreutils
+    - name: Bootstrap (gnulib and autoreconf)
+      run: PATH="$(brew --prefix)/opt/m4/bin:${PATH}" ./bootstrap
+    - name: configure
+      # Note: aspell should work on macOS, but has been removed because one of
+      # the tests fails; see https://github.com/GNUAspell/aspell/issues/555
+      run: ./configure --enable-relocatable --without-aspell
+    - name: make
+      run: make --jobs=`nproc`
+    - name: make check
+      run: make check --jobs=`nproc`
+    - name: make distcheck
+      run: make distcheck --jobs=`nproc` DISTCHECK_CONFIGURE_FLAGS="--without-aspell"
diff --git a/build-aux/appveyor-build.sh b/build-aux/appveyor-build.sh
deleted file mode 100755
index db42400..0000000
--- a/build-aux/appveyor-build.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# Build on AppVeyor
-# Written by Reuben Thomas 2020.
-# This file is in the public domain.
-
-set -e
-
-./bootstrap
-CONFIGURE_ARGS=(--enable-relocatable --with-zemberek=check)
-if [[ "$ASAN" == "yes" ]]; then
-    CONFIGURE_ARGS+=(CFLAGS="-g3 -fsanitize=address -fsanitize=undefined" CXXFLAGS="-g3 -fsanitize=address -fsanitize=undefined" LDFLAGS="-fsanitize=address -fsanitize=undefined")
-fi
-./configure "${CONFIGURE_ARGS[@]}"
-make
-make distcheck
-
-if [[ "$APPVEYOR_BUILD_WORKER_IMAGE" == "Ubuntu" ]]; then sudo locale-gen fr_FR.UTF-8; env LANG=fr_FR.UTF-8 make check ; fi