From 5da7a4caf34346014fbd496187ed8ee8e4915b1d Mon Sep 17 00:00:00 2001
From: Federico Igne <git@federicoigne.com>
Date: Thu, 21 Oct 2021 12:02:40 +0100
Subject: Setup tests for both master and develop

We are avoiding slow tests for now since they seem to run out of RAM.
Also note that in the GitHub Actions we used a trick to expose the
`$HOME` env variable, as described here:

        https://web.archive.org/web/20211021130639/https://brandur.org/fragments/github-actions-env-vars-in-env-vars

A nice badge in the README will also tell the outcome of the process.
---
 .github/workflows/scala.yml | 33 ++++++++++++++++++++++++---------
 README.md                   |  9 ++++++---
 getlibs.sh                  | 11 -----------
 rdfox_setup.sh              | 13 +++++++++++++
 4 files changed, 43 insertions(+), 23 deletions(-)
 delete mode 100755 getlibs.sh
 create mode 100755 rdfox_setup.sh

diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
index a2308cb..3b18bf9 100644
--- a/.github/workflows/scala.yml
+++ b/.github/workflows/scala.yml
@@ -2,25 +2,40 @@ name: Scala CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, develop ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, develop ]
 
 jobs:
-  build:
+
+  build_and_test:
+    name: "Build and test"
 
     runs-on: ubuntu-latest
 
     steps:
+
     - uses: actions/checkout@v2
-      
-    - name: Set up JDK 1.8
+
+    - name: "Set up JDK 1.8"
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
-    
-    - name: Get libs
-      run: ./getlibs.sh
+
+    - name: Setup RDFox
+      run: ./rdfox_setup.sh
+
+    - name: Setup RDFox server path
+      run: echo "SERVER_DIR=$HOME/.RDFox" >> "$GITHUB_ENV"
+    - name: Setup RDFox license
+      env:
+        LICENSE_CONTENT: ${{ secrets.LICENSE_CONTENT }}
+      run: |
+        mkdir -p "$SERVER_DIR"
+        echo "$LICENSE_CONTENT" > "$SERVER_DIR/RDFox.lic"
+
+    - name: Build RSAComb
+      run: sbt compile
 
     - name: Run tests
-      run: sbt test
+      run: sbt "testOnly * -- -l org.scalatest.tags.Slow"
diff --git a/README.md b/README.md
index 9cd3029..d8c782e 100644
--- a/README.md
+++ b/README.md
@@ -19,13 +19,16 @@ Combined approach for Conjunctive Query answering in RSA
 <a href="https://github.com/KRR-Oxford/RSAComb/issues">Report bug</a>
 <br/><br/>
 <a href="https://github.com/KRR-Oxford/RSAComb/releases/latest">
-<img src="https://img.shields.io/github/release/KRR-Oxford/RSAComb.svg?style=for-the-badge" alt="Release badge">
+    <img src="https://img.shields.io/github/release/KRR-Oxford/RSAComb.svg?style=for-the-badge" alt="Release badge">
 </a>
 <a href="https://github.com/KRR-Oxford/RSAComb/issues">
-<img src="https://img.shields.io/github/issues/KRR-Oxford/RSAComb.svg?style=for-the-badge" alt="Issues badge">
+    <img src="https://img.shields.io/github/issues/KRR-Oxford/RSAComb.svg?style=for-the-badge" alt="Issues badge">
+</a>
+<a href="https://github.com/KRR-Oxford/RSAComb/actions">
+    <img src="https://img.shields.io/github/workflow/status/KRR-Oxford/RSAComb/Scala%20CI/develop?label=TESTS&style=for-the-badge" alt="GitHub Actions badge">
 </a>
 <a href="LICENSE">
-<img src="https://img.shields.io/github/license/KRR-Oxford/RSAComb.svg?style=for-the-badge" alt="License badge">
+    <img src="https://img.shields.io/github/license/KRR-Oxford/RSAComb.svg?style=for-the-badge" alt="License badge">
 </a>
 <a href="https://doi.org/10.5281/zenodo.5047811">
     <img src="https://img.shields.io/badge/DOI-10.5281/zenodo.5047811-blue?style=for-the-badge" alt="DOI badge">
diff --git a/getlibs.sh b/getlibs.sh
deleted file mode 100755
index be24be7..0000000
--- a/getlibs.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-VERSION="4.1.0"
-NAME="RDFox-linux-$VERSION"
-LINK="https://rdfox-distribution.s3.eu-west-2.amazonaws.com/release/v$VERSION/$NAME.zip"
-DEST="./lib/"
-
-mkdir -p "$DEST"
-wget "$LINK"
-unzip "$NAME.zip"
-cp "./$NAME/lib/JRDFox.jar" "$DEST"
diff --git a/rdfox_setup.sh b/rdfox_setup.sh
new file mode 100755
index 0000000..2091088
--- /dev/null
+++ b/rdfox_setup.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+VERSION="5.2.1"
+NAME="RDFox-linux-x86_64-$VERSION"
+LINK="https://rdfox-distribution.s3.eu-west-2.amazonaws.com/release/v$VERSION/$NAME.zip"
+DEST="lib"
+
+mkdir -p "$DEST"
+cd "$DEST"
+wget "$LINK"
+unzip "$NAME.zip"
+ln -s "$NAME/lib/JRDFox.jar"
+cd -
-- 
cgit v1.2.3