Fixing build for Github actions

Deltares-research · Apr 9, 2024 · fef7c02 · fef7c02
1 parent 00847cf
commit fef7c02
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 75 deletions.
diff --git a/gradlew b/gradlew
diff --git a/mydeltares-keycloak-spi/build.gradle b/mydeltares-keycloak-spi/build.gradle
@@ -32,7 +32,7 @@ dependencies {
     testImplementation('org.apache.httpcomponents:httpmime:4.5.14')
 
     testImplementation('org.junit.jupiter:junit-jupiter:5.9.1')
-    implementation platform('org.testcontainers:testcontainers-bom:1.19.3') //import bom
+    implementation platform('org.testcontainers:testcontainers-bom:1.19.1') //import bom
     testImplementation('org.testcontainers:mysql') //no version specified
     testImplementation('org.junit.platform:junit-platform-suite-engine')
 
@@ -53,41 +53,18 @@ jar {
     from { configurations.extraLibs.collect { it.isDirectory() ? it : zipTree(it) } }
 }
 
-tasks.register('copyJarsToDocker', Copy) {
-
-    if (file('build/libs/mydeltares-keycloak-spi-3.0.jar').exists()){
-        println('File exists during configuration')
-    } else {
-        println('File does not exist during configuration')
-    }
-
-    copy {
-        println('Copying jars to docker')
-        from('build/libs/')
-        into( '../docker/keycloak/providers/')
-    }
-}
-
-tasks.register('copyJarsToLiferay', Copy) {
-
-    if (file('build/libs/mydeltares-keycloak-theme-3.0.jar').exists()){
-        println('File exists during configuration')
-    } else {
-        println('File does not exist during configuration')
-    }
-
+tasks.register('copyJarsToDocker', Task) {
+    println('Copying jars to docker')
     copy {
-        println('Copying jars to docker')
         from('build/libs/')
-        into( liferayDockerPath)
+        into(liferayDockerPath + '/docker/keycloak/providers/')
     }
-
 }
 
 jar {
     println('Configuring build step')
     doLast {
         println('Running last step: copyJarsToDocker')
-        tasks.copyJarsToDocker
+        copyJarsToDocker
     }
 }
diff --git a/mydeltares-keycloak-spi/src/test/java/nl/deltares/keycloak/IntegrationTestSuite.java b/mydeltares-keycloak-spi/src/test/java/nl/deltares/keycloak/IntegrationTestSuite.java
@@ -1,16 +1,15 @@
 package nl.deltares.keycloak;
 
 import nl.deltares.keycloak.utils.KeycloakTestServer;
-import org.junit.BeforeClass;
 import org.junit.platform.suite.api.IncludeTags;
 import org.junit.platform.suite.api.SelectPackages;
 import org.junit.platform.suite.api.Suite;
 
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @SelectPackages({"nl.deltares.keycloak"})
 @IncludeTags("IntegrationTestCategory")
@@ -25,22 +24,10 @@ public static void startKeyCloak() throws Throwable {
         final File testResources = Paths.get( "src", "test", "resources", "docker").toFile();
         final File buildLibs = Paths.get( "build", "libs").toFile();
 
-        File keycloakTmpDir = Files.createTempDirectory("keycloak").toFile();
+       Files.copy(new File(buildLibs, "mydeltares-keycloak-spi-3.0.jar").toPath(),
+                new File(testResources, "/keycloak/providers/mydeltares-keycloak-spi-3.0.jar").toPath(), StandardCopyOption.REPLACE_EXISTING);
 
-        File dataDir = new File(keycloakTmpDir, "keycloak/data/import");
-        dataDir.mkdirs();
-        File configDir = new File(keycloakTmpDir, "keycloak/conf");
-        configDir.mkdir();
-        File deploymentDir = new File(keycloakTmpDir, "keycloak/providers");
-        deploymentDir.mkdir();
-
-        Files.copy(new File(testResources, "docker-compose.yml").toPath(), new File(keycloakTmpDir, "docker-compose.yml").toPath());
-        Files.copy(new File(testResources, "keycloak/data/import/realm-export.json").toPath(), new File(dataDir, "realm-export.json").toPath());
-        Files.copy(new File(testResources, "keycloak/conf/keycloak.conf").toPath(), new File(configDir, "keycloak.conf").toPath());
-        Files.copy(new File(buildLibs, "mydeltares-keycloak-spi-3.0.jar").toPath(), new File(deploymentDir, "mydeltares-keycloak-spi-3.0.jar").toPath());
-//        Files.copy(new File(testResources, "keycloak/providers/mydeltares-keycloak-theme-3.0.jar").toPath(), new File(deploymentDir, "mydeltares-keycloak-theme-3.0.jar").toPath());
-
-        KeycloakTestServer.startKeycloak(keycloakTmpDir.getPath());
+        KeycloakTestServer.startKeycloak(testResources.getPath());
 
     }
 

diff --git a/mydeltares-keycloak-spi/src/test/resources/docker/docker-compose.yml b/mydeltares-keycloak-spi/src/test/resources/docker/docker-compose.yml
@@ -27,7 +27,7 @@ services:
       - keycloak
 
   keycloak:
-    image: quay.io/keycloak/keycloak:23.0.0
+    image: quay.io/keycloak/keycloak:24.0.1
     ports:
       - 8080:8080
       - 8787:8787

diff --git a/mydeltares-keycloak-theme/build.gradle b/mydeltares-keycloak-theme/build.gradle
@@ -18,43 +18,18 @@ test {
     useJUnitPlatform()
 }
 
-tasks.register('copyJarsToDocker', Copy) {
-
-    if (file('build/libs/mydeltares-keycloak-theme-3.0.jar').exists()){
-        println('File exists during configuration')
-    } else {
-        println('File does not exist during configuration')
-    }
-
-    copy {
-        println('Copying jars to docker')
-        from('build/libs/')
-        into( '../docker/keycloak/providers/')
-
-    }
-
-}
-
-tasks.register('copyJarsToLiferay', Copy) {
-
-    if (file('build/libs/mydeltares-keycloak-theme-3.0.jar').exists()){
-        println('File exists during configuration')
-    } else {
-        println('File does not exist during configuration')
-    }
-
+tasks.register("copyJarsToDocker", Task) {
+    println('Copying jars to docker')
     copy {
-        println('Copying jars to docker')
         from('build/libs/')
-        into( liferayDockerPath)
+        into(liferayDockerPath + '/docker/keycloak/providers/')
     }
-
 }
 
 jar {
     println('Configuring build step')
     doLast {
         println('Running last step: copyJarsToDocker')
-        tasks.copyJarsToDocker
+        copyJarsToDocker
     }
 }