3 files changed, 36 insertions, 16 deletions

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/rdfox_setup.sh
index be24be7..2091088 100755
--- a/getlibs.sh
+++ b/rdfox_setup.sh
@@ -1,11 +1,13 @@
 #!/bin/sh
 
-VERSION="4.1.0"
-NAME="RDFox-linux-$VERSION"
+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/"
+DEST="lib"
 
 mkdir -p "$DEST"
+cd "$DEST"
 wget "$LINK"
 unzip "$NAME.zip"
-cp "./$NAME/lib/JRDFox.jar" "$DEST"
+ln -s "$NAME/lib/JRDFox.jar"
+cd -