Merge remote-tracking branch 'origin/master'

krissrex · Nov 22, 2019 · 9899aa9 · 9899aa9
2 parents 1445843 + b042869
commit 9899aa9
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml
@@ -0,0 +1,23 @@
+name: CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Cache
+      uses: actions/cache@v1.0.3
+      id: maven-cache
+      with:
+        # A directory to store and save the cache
+        path: ~/.m2
+        # An explicit key for restoring and saving the cache
+        key: ${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
+    - name: GitHub Action for Maven
+      uses: LucaFeger/action-maven-cli@1.1.0
+      with:
+        args: clean test
diff --git a/no.ntnu.tdt4250.nginx.dsl/src/no/ntnu/tdt4250/validation/NginxValidator.xtend b/no.ntnu.tdt4250.nginx.dsl/src/no/ntnu/tdt4250/validation/NginxValidator.xtend
@@ -127,10 +127,14 @@ class NginxValidator extends AbstractNginxValidator {
 
 	def void checkLogName(String logName) {
 		if (logName !== null) {
-			val foundMatch = checkRegex(logName, "^\\/[a-zA-Z0-9-]+([\\/][a-zA-Z0-9-]*)*.log$")
+			// Absolute file path
+			val foundMatch = checkRegex(logName, "^\\/[a-zA-Z0-9-]+([\\/][a-zA-Z0-9-]*)*\\.log$")
+
+			// File name
+			//val foundMatch = checkRegex(logName, "^[a-zA-Z0-9-_.]+\\.log$")
 			if (foundMatch == false) {
 				error(
-					'Log name: ' + logName + ' is not valid',
+					'Log name: ' + logName + ' is not valid. Expected "/**.log"',
 					NginxPackage.Literals.SITE__LOG_NAME,
 					INVALID_LOG_NAME
 				)