Merge branch 'development' into...

Merge branch 'development' into 144-module-grades-don-t-work-for-modules-where-the-assignment-name-starts-with-a-number

.gitlab-ci.yml

@@ -63,7 +63,7 @@ gradle_build:
   stage: build
   rules:
     - if: $CI_COMMIT_BRANCH == "master" ||
-        $CI_COMMIT_BRANCH == "dev" ||
+        $CI_COMMIT_BRANCH == "development" ||
         $CI_MERGE_REQUEST_ID ||
         $CI_PIPELINE_SOURCE == "push" ||
         $CI_PIPELINE_SOURCE == "trigger"
@@ -91,7 +91,7 @@ gradle_test:
   rules:
     - if: $CI_PIPELINE_SOURCE == "trigger"
       when: never
-    - if: $CI_COMMIT_BRANCH == "dev" ||
+    - if: $CI_COMMIT_BRANCH == "development" ||
         $CI_MERGE_REQUEST_ID ||
         $CI_PIPELINE_SOURCE == "push"
   coverage: '/Code coverage: \d+\.\d+/'
@@ -128,7 +128,7 @@ mysql_migration:
     - if: $CI_PIPELINE_SOURCE == "trigger"
       when: never
     - if: $CI_COMMIT_BRANCH == "master" ||
-        $CI_COMMIT_BRANCH == "dev" ||
+        $CI_COMMIT_BRANCH == "development" ||
         $CI_MERGE_REQUEST_ID ||
         $CI_PIPELINE_SOURCE == "push"
   stage: prepare
@@ -170,7 +170,7 @@ postgreSQL_migration:
     - if: $CI_PIPELINE_SOURCE == "trigger"
       when: never
     - if: $CI_COMMIT_BRANCH == "master" ||
-        $CI_COMMIT_BRANCH == "dev" ||
+        $CI_COMMIT_BRANCH == "development" ||
         $CI_MERGE_REQUEST_ID ||
         $CI_PIPELINE_SOURCE == "push"
   stage: prepare
@@ -215,7 +215,7 @@ mysql_test:
 
     # Run on development and master branches.
     - if: $CI_COMMIT_BRANCH == "master" ||
-        $CI_COMMIT_BRANCH == "dev"
+        $CI_COMMIT_BRANCH == "development"
 
     # Only run on merge requests that change one of the model/migration files otherwise.
     - if: $CI_PIPELINE_SOURCE != "merge_request_event"
@@ -256,7 +256,7 @@ mysql_test:
 #
 #    # Always run on development and master branches.
 #    - if: $CI_COMMIT_BRANCH == "master" ||
-#        $CI_COMMIT_BRANCH == "dev"
+#        $CI_COMMIT_BRANCH == "development"
 #
 #    # Only run on merge requests that change one of the model/migration files otherwise.
 #    - if: $CI_PIPELINE_SOURCE != "merge_request_event"
@@ -301,7 +301,7 @@ gradle_spotless:
     - if: $CI_PIPELINE_SOURCE == "trigger"
       when: never
     - if: $CI_COMMIT_BRANCH == "master" ||
-        $CI_COMMIT_BRANCH == "dev" ||
+        $CI_COMMIT_BRANCH == "development" ||
         $CI_MERGE_REQUEST_ID ||
         $CI_PIPELINE_SOURCE == "push"
   artifacts:
@@ -327,7 +327,7 @@ gradle_licenses:
     - if: $CI_PIPELINE_SOURCE == "trigger"
       when: never
     - if: $CI_COMMIT_BRANCH == "master" ||
-        $CI_COMMIT_BRANCH == "dev" ||
+        $CI_COMMIT_BRANCH == "development" ||
         $CI_MERGE_REQUEST_ID ||
         $CI_PIPELINE_SOURCE == "push"
   stage: review
@@ -346,7 +346,7 @@ publish_jar:
   stage: publish
   rules:
     - if: $CI_COMMIT_BRANCH == "master" ||
-        $CI_COMMIT_BRANCH == "dev" ||
+        $CI_COMMIT_BRANCH == "development" ||
         $CI_MERGE_REQUEST_ID ||
         $CI_PIPELINE_SOURCE == "push" ||
         $CI_PIPELINE_SOURCE == "trigger"
@@ -448,7 +448,7 @@ code_quality:
         $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
       when: never
     - if: $CI_COMMIT_BRANCH == "master" ||
-        $CI_COMMIT_BRANCH == "dev" ||
+        $CI_COMMIT_BRANCH == "development" ||
         $CI_MERGE_REQUEST_ID
   stage: report
 
@@ -462,7 +462,7 @@ spotbugs-sast:
         $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
       when: never
     - if: $CI_COMMIT_BRANCH == "master" ||
-        $CI_COMMIT_BRANCH == "dev" ||
+        $CI_COMMIT_BRANCH == "development" ||
         $CI_MERGE_REQUEST_ID
   stage: report
   needs:
@@ -480,7 +480,7 @@ dast:
     - if: $CI_PIPELINE_SOURCE == "trigger" ||
         $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
       when: never
-    - if: $CI_COMMIT_BRANCH == "dev"
+    - if: $CI_COMMIT_BRANCH == "development"
       when: manual
   stage: live report
   variables:
@@ -499,7 +499,7 @@ secret_detection:
         $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
       when: never
     - if: $CI_COMMIT_BRANCH == "master" ||
-        $CI_COMMIT_BRANCH == "dev" ||
+        $CI_COMMIT_BRANCH == "development" ||
         $CI_MERGE_REQUEST_ID
   stage: report
 
@@ -513,7 +513,7 @@ gemnasium-maven-dependency_scanning:
         $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
       when: never
     - if: $CI_COMMIT_BRANCH == "master" ||
-        $CI_COMMIT_BRANCH == "dev" ||
+        $CI_COMMIT_BRANCH == "development" ||
         $CI_MERGE_REQUEST_ID
   needs:
     - gradle_build
@@ -526,7 +526,7 @@ a11y:
     - if: $CI_PIPELINE_SOURCE == "trigger" ||
         $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
       when: never
-    - if: $CI_COMMIT_BRANCH == "dev"
+    - if: $CI_COMMIT_BRANCH == "development"
   stage: live report
   variables:
     ally_urls: "https://submit.eiptest.ewi.tudelft.nl"
@@ -542,7 +542,7 @@ browser_performance:
     - if: $CI_PIPELINE_SOURCE == "trigger" ||
         $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
       when: never
-    - if: $CI_COMMIT_BRANCH == "dev"
+    - if: $CI_COMMIT_BRANCH == "development"
   stage: live report
   variables:
     URL: "https://submit.eiptest.ewi.tudelft.nl"

build.gradle.kts

@@ -2,6 +2,7 @@ import com.diffplug.gradle.spotless.SpotlessExtension
 import org.springframework.boot.gradle.tasks.bundling.BootJar
 import nl.javadude.gradle.plugins.license.DownloadLicensesExtension
 import nl.javadude.gradle.plugins.license.LicenseExtension
+import java.nio.file.Files
 
 group = "nl.tudelft.submit"
 version = "2.2.0"
@@ -71,8 +72,6 @@ plugins {
     // Open API generator for generating the Client code for Labracore.
 //    is this needed?
 //    id("org.openapi.generator").version("4.2.3")
-
-	id("com.unclezs.gradle.sass").version("1.0.10")
 }
 
 sourceSets {
@@ -173,8 +172,6 @@ val jacocoTestReport by tasks.getting(JacocoReport::class) {
 // Task for generating the client code for connecting with the Labracore API
 // val generateSubmitClient?
 
-val processResources by tasks.getting(ProcessResources::class)
-
 // Configure Spring Boot plugin task for running the application.
 val bootJar by tasks.getting(BootJar::class) {
     enabled = true
@@ -218,9 +215,40 @@ tasks.withType<Test>().configureEach {
 }
 
 // Configure the sass compiling task to use the sass and css directories.
-sass {
-	cssPath = "static/css"
-	sassPath = "scss"
+tasks.register("ensureDirectory") {
+    // Store target directory into a variable to avoid project reference in the configuration cache
+    val directories = listOf(file("src/main/resources/static/css"), file("src/main/resources/scss"))
+
+    doLast {
+        directories.forEach { directory ->
+            Files.createDirectories(directory.toPath())
+        }
+    }
+}
+task<Exec>("sassCompile") {
+    dependsOn.add(tasks.getByName("ensureDirectory"))
+    if (System.getProperty("os.name").contains("windows",true)) {
+        commandLine("cmd", "/c", "sass", "src/main/resources/scss:src/main/resources/static/css")
+    } else {
+        commandLine("echo", "Checking for sass or sassc...")
+        doLast {
+            val res = exec {
+                isIgnoreExitValue = true
+                executable = "bash"
+                args = listOf("-l", "-c", "sass --version")
+            }
+            if (res.exitValue == 0) {
+                exec { commandLine("sass", "src/main/resources/scss:src/main/resources/static/css") }
+            } else {
+                File("src/main/resources/scss").listFiles()!!.filter { it.extension == "scss" && !it.name.startsWith("_") }.forEach {
+                    exec { commandLine("sassc", "src/main/resources/scss/${it.name}", "src/main/resources/static/css/${it.nameWithoutExtension}.css") }
+                }
+            }
+        }
+    }
+}
+val processResources by tasks.getting(ProcessResources::class) {
+    dependsOn.add(tasks.getByName("sassCompile"))
 }
 
 dependencies {