Merge pull request #140 from uc-cdis/feat/enable_ci_for_local_main_br…

…anch

Feat/enable CI for local main branch

.github/workflows/ci_custom.yaml

@@ -0,0 +1,38 @@
+# Continuous integration
+name: CI CTDS
+
+# Run customized version of CI in our local fork's main (default) branch and pull requests to
+# this branch (note: this ci_custom.yaml file is a simplified version of the ci.yaml file in this same directory)
+on:
+  push:
+    branches: [ 2.15.0-DEV ]
+  pull_request:
+    branches: [ 2.15.0-DEV ]
+
+jobs:
+  # Build and test the code
+  build:
+    runs-on: ubuntu-latest
+
+    env:
+      MAVEN_PROFILE: webapi-postgresql
+
+    steps:
+      # Checks-out repository under $GITHUB_WORKSPACE, so the job can access it
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-java@v1
+        with:
+            java-version: 8
+
+      - name: Maven cache
+        uses: actions/cache@v2
+        with:
+            path: ~/.m2
+            # Key for restoring and saving the cache
+            key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml') }}
+            restore-keys: |
+              ${{ runner.os }}-maven-
+
+      - name: Test
+        run: mvn -B -P${{ env.MAVEN_PROFILE }} test

pom.xml

@@ -831,7 +831,7 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.7</version>
+      <version>2.14.0</version>
     </dependency>
     <dependency>
       <groupId>com.sun.xml.security</groupId>

src/test/java/org/ohdsi/webapi/generationcache/GenerationCacheTest.java

@@ -4,6 +4,7 @@
 import com.odysseusinc.arachne.execution_engine_common.api.v1.dto.KerberosAuthMechanism;
 import net.lingala.zip4j.ZipFile;
 import net.lingala.zip4j.exception.ZipException;
+import org.springframework.transaction.annotation.Transactional;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -170,6 +171,7 @@ public void generateCohort() {
     }
 
     @Test
+    @Transactional
     public void checkCachingWithEmptyResultSet() {
 
         CacheableGenerationType type = CacheableGenerationType.COHORT;