aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/mac.yml39
-rwxr-xr-x.github/workflows/mac/before_install.sh13
-rwxr-xr-x.github/workflows/mac/install.sh (renamed from travis/osx/install.sh)5
-rw-r--r--.travis.yml5
-rwxr-xr-xtravis/osx/after_success.sh5
-rwxr-xr-xtravis/osx/before_install.sh22
6 files changed, 56 insertions, 33 deletions
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
new file mode 100644
index 00000000..1ccbd938
--- /dev/null
+++ b/.github/workflows/mac.yml
@@ -0,0 +1,39 @@
+name: MacOS build
+
+on: [push, pull_request]
+
+jobs:
+
+ macos_build:
+ runs-on: macos-latest
+ if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
+ steps:
+
+ - uses: actions/checkout@v2
+
+ - uses: conda-incubator/setup-miniconda@v2
+ with:
+ channels: conda-forge
+ auto-update-conda: true
+
+ - name: Cache
+ uses: actions/cache@v2
+ id: cache
+ with:
+ path: ~/.ccache
+ key: ${{ runner.os }}-cache-mac-${{ github.run_id }}
+ restore-keys: ${{ runner.os }}-cache-mac-
+
+ - name: Install Requirements
+ shell: bash -l {0}
+ run: |
+ source .github/workflows/mac/before_install.sh
+
+ - name: Build
+ shell: bash -l {0}
+ run: |
+ export TRAVIS_BUILD_DIR=$PWD
+ source .github/workflows/mac/install.sh
+ env:
+ TRAVIS_OS_NAME: osx
+ BUILD_NAME: osx
diff --git a/.github/workflows/mac/before_install.sh b/.github/workflows/mac/before_install.sh
new file mode 100755
index 00000000..217039fe
--- /dev/null
+++ b/.github/workflows/mac/before_install.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+
+conda update -n base -c defaults conda
+conda install compilers -y
+
+conda config --set channel_priority strict
+conda install --yes --quiet python=3.8 autoconf automake libtool ccache -y
+conda install --yes --quiet proj=7.1.1=h45baca5_3 --only-deps -y
+
+./travis/before_install_pip.sh
diff --git a/travis/osx/install.sh b/.github/workflows/mac/install.sh
index ff5266f6..ed27150f 100755
--- a/travis/osx/install.sh
+++ b/.github/workflows/mac/install.sh
@@ -5,6 +5,9 @@ set -e
export CCACHE_CPP2=yes
export PROJ_DB_CACHE_DIR="$HOME/.ccache"
-export PATH=$HOME/Library/Python/3.6/bin:$PATH
+ccache -M 200M
+ccache -s
CC="ccache clang" CXX="ccache clang++" CFLAGS="-Werror -O2" CXXFLAGS="-Werror -O2" ./travis/install.sh
+
+ccache -s
diff --git a/.travis.yml b/.travis.yml
index dc5356ad..1053ce1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -82,11 +82,6 @@ matrix:
- BUILD_NAME=linux_generic
- DETAILS="linux, arm64"
- - os: osx
- env:
- - BUILD_NAME=osx
- - DETAILS="osx"
-
- os: linux
dist: xenial
compiler: gcc
diff --git a/travis/osx/after_success.sh b/travis/osx/after_success.sh
deleted file mode 100755
index 9618f673..00000000
--- a/travis/osx/after_success.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# nothing
diff --git a/travis/osx/before_install.sh b/travis/osx/before_install.sh
deleted file mode 100755
index 5af2fd7a..00000000
--- a/travis/osx/before_install.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export PATH=$HOME/Library/Python/3.7/bin:$PATH
-
-#brew unlink python@2
-#brew update
-brew install ccache
-#brew upgrade sqlite3
-#brew upgrade libtiff
-#brew install doxygen graphviz
-#brew install md5sha1sum
-#brew reinstall python
-#brew reinstall wget
-
-./travis/before_install_pip.sh
-
-# pip3 install --user sphinx sphinx-rtd-theme sphinxcontrib-bibtex breathe
-# which sphinx-build
-
-# (cd docs; make html)