From 56389bff7735cba622273345cc7e4442bfcfc1c5 Mon Sep 17 00:00:00 2001
From: Dean Eigenmann <7621705+decanus@users.noreply.github.com>
Date: Tue, 21 Jul 2020 19:14:12 +0200
Subject: [PATCH] fix/github-actions-mac-linux (#67)

---
 .github/workflows/test.yml | 45 +++++++++++++++++++++--------------
 .travis.yml                | 48 --------------------------------------
 2 files changed, 27 insertions(+), 66 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 213cee6ee..40d84d64d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,25 +7,34 @@ on:
       - master
 
 jobs:
-  build:
-    env:
-      - { NPROC: 2 }
-      - { NPROC: 6 }
+  test:
+    strategy:
+      matrix:
+        env:
+          - { NPROC: 2 }
+          - { NPROC: 6 }
+        platform: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.platform }}
+    env: ${{ matrix.env }}
 
-    runs-on: [ubuntu-latest, macos-latest]
+    name: ${{ matrix.platform }} - ${{ matrix.env.NPROC }} processes
 
-    - name: Install dependencies
-      run: |
-        make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC}" V=1 update 
-        make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC}" LOG_LEVEL=TRACE
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
 
-    - name: Cache Nim
-      id: cache-choosenim
-      uses: actions/cache@v1
-      with:
-        path: vendor/nimbus-build-system/vendor/Nim/bin
-        key: ${{ runner.os }}-nim-${{ hashFiles(vendor/nimbus-build-system/) }}
+      - name: Install dependencies
+        run: |
+          make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC}" V=1 update 
+          make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC}" LOG_LEVEL=TRACE
 
-    - name: Run Tests
-      run: |
-        make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC}" test
+      - name: Cache Nim
+        id: cache-nim
+        uses: actions/cache@v1
+        with:
+          path: vendor/nimbus-build-system/vendor/Nim/bin
+          key: ${{ runner.os }}-nim-${{ hashFiles('.gitmodules') }}
+
+      - name: Run Tests
+        run: |
+          make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC}" test
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index e86a58c61..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-language: c
-
-dist: bionic
-
-# https://docs.travis-ci.com/user/caching/
-cache:
-  ccache: true
-  directories:
-    - vendor/nimbus-build-system/vendor/Nim/bin
-
-git:
-  # when multiple CI builds are queued, the tested commit needs to be in the last X commits cloned with "--depth X"
-  depth: 10
-
-matrix:
-  include:
-    - os: linux
-      arch: amd64
-      sudo: required
-      env:
-        - NPROC=2
-      before_install:
-        - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
-        - sudo apt-get -q update
-    - os: linux
-      arch: arm64
-      sudo: required
-      env:
-        - NPROC=6 # Worth trying more than 2 parallel jobs: https://travis-ci.community/t/no-cache-support-on-arm64/5416/8
-        # (also used to get a different cache key than the amd64 one)
-      before_install:
-        - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
-        - sudo apt-get -q update
-        - sudo apt-get install -y libpcre3-dev
-    - os: osx
-      before_install:
-        - HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 brew install ccache
-      env:
-        - NPROC=2
-
-script:
-  - set -e # fail fast
-  # Building Nim-1.0.4 takes up to 10 minutes on Travis - the time limit after which jobs are cancelled for having no output
-  - make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC}" V=1 update # to allow a newer Nim version to be detected
-  - make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC}" LOG_LEVEL=TRACE
-  - build/wakunode --help
-  - make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC}" test
-