Improve CI

mxlint · Apr 12, 2024 · 4bdd3c4 · 4bdd3c4
1 parent 4d01992
commit 4bdd3c4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,15 @@ on:
 
 jobs:
 
-  build:
+  Policies:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Test Policies
+      run: ./run-policy-tests.sh
+
+  CLI:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -26,7 +34,7 @@ jobs:
       run: go test -v ./...
 
     - name: xunit-report
-      run: ./bin/mendix-cli lint --xunit-report report.xml
+      run: ./bin/mendix-cli lint --xunit-report report.xml || true
 
     - name: Process xunit-report
       uses: dorny/test-reporter@v1

diff --git a/run-policy-tests.sh b/run-policy-tests.sh
@@ -4,11 +4,23 @@ set -e
 
 OPA="./bin/opa"
 
+UNAME="$(uname -s)"
+echo "OS: $UNAME"
+
+if [ "$UNAME" = "Linux" ]; then
+    OPA_DL="opa_linux_amd64"
+elif [ "$UNAME" = "Darwin" ]; then
+    OPA_DL="opa_darwin_amd64"
+else
+    echo "Unsupported OS"
+    exit 1
+fi
+
 if [ ! -f "$OPA" ]; then
     echo "Program not found, downloading..."
-    curl -L -o "$OPA" https://openpolicyagent.org/downloads/v0.63.0/opa_darwin_amd64
+    mkdir -p bin
+    curl -L -o "$OPA" "https://openpolicyagent.org/downloads/v0.63.0/$OPA_DL"
     chmod +x "$OPA"
 fi
 
-OPA test -v policies
-
+$OPA test -v policies