CI: add distcheck and MacOS build to github actions

diff --git a/.cirrus.yml b/.cirrus.yml
index ab03f78b8e6ddd2a0c96ae01268548986e197d10..f7e347b9ca98b7ba551bbaef166d31d7b76380c6 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -26,28 +26,6 @@ FreeBSD_task:
   install_script:
   - ./build/ci/build.sh -a install
 
-MacOS_task:
-  matrix:
-    env:
-      BS: autotools
-    env:
-      BS: cmake
-  matrix:
-    osx_instance:
-      image: mojave-xcode-10.2
-  prepare_script:
-  - ./build/ci/cirrus_ci/ci.sh prepare
-  configure_script:
-  - ./build/ci/build.sh -a autogen
-  - ./build/ci/build.sh -a configure
-  build_script:
-  - ./build/ci/build.sh -a build
-  test_script:
-  - ./build/ci/build.sh -a test
-  - ./build/ci/cirrus_ci/ci.sh test
-  install_script:
-  - ./build/ci/build.sh -a install
-
 Fedora_30_task:
   container:
     dockerfile: build/ci/cirrus_ci/Dockerfile.fc30

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1b0debcb3c1a6b61c1a4c5742a44515fdc684ae3..7d5ba4fa4d80f4c23cb8535f0b5eca0700e03003 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,6 +3,37 @@ name: CI
 on: [push, pull_request]
 
 jobs:
+  MacOS:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        bs: [autotools, cmake]
+    steps:
+    - uses: actions/checkout@master
+    - name: Install dependencies
+      run: ./build/ci/github_actions/macos.sh prepare
+    - name: Autogen
+      run: ./build/ci/build.sh -a autogen
+      env:
+        BS: ${{ matrix.bs }}
+    - name: Configure
+      run: ./build/ci/build.sh -a configure
+      env:
+        BS: ${{ matrix.bs }}
+    - name: Build
+      run: ./build/ci/build.sh -a build
+      env:
+        BS: ${{ matrix.bs }}
+    - name: Test
+      run: ./build/ci/build.sh -a test
+      env:
+        BS: ${{ matrix.bs }}
+        SKIP_OPEN_FD_ERR_TEST: 1
+    - name: Install
+      run: ./build/ci/build.sh -a install
+      env:
+        BS: ${{ matrix.bs }}
+
   Ubuntu:
     runs-on: ubuntu-latest
     strategy:
@@ -34,6 +65,21 @@ jobs:
       env:
         BS: ${{ matrix.bs }}
 
+  Ubuntu-distcheck:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Install dependencies
+      run: sudo apt-get install -y build-essential cmake libssl-dev libacl1-dev libbz2-dev liblzma-dev libzip-dev liblz4-dev libzstd-dev lzop groff ghostscript
+    - name: Autogen
+      run: ./build/ci/build.sh -a autogen
+    - name: Configure
+      run: ./build/ci/build.sh -a configure
+    - name: Distcheck
+      run: ./build/ci/build.sh -a distcheck
+      env:
+        SKIP_OPEN_FD_ERR_TEST: 1
+
   Windows:
     runs-on: windows-latest
     strategy:

diff --git a/build/ci/github_actions/macos.sh b/build/ci/github_actions/macos.sh
new file mode 100755 (executable)
index 0000000..e51574c
--- /dev/null
+++ b/build/ci/github_actions/macos.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+if [ "$1" = "prepare" ]
+then
+       set -x -e
+       brew update > /dev/null
+       for pkg in autoconf automake libtool pkg-config cmake xz lz4 zstd
+       do
+               brew list $pkg > /dev/null && brew upgrade $pkg || brew install $pkg
+       done
+fi