run-ci.sh

@@ -26,17 +26,8 @@ function enter-section() {
 
   eval "$2"
   exit_status=$?
-
+  if ! [ $exit_status -eq $3 ]; then
-  if [ "$3" == "should fail" ]; then
+    abort "command: $2 failed in section: $1"
-    log "INFO" "expected to fail..."
-    if [ $exit_status -eq 0 ]; then
-      abort "command: $2 failed in section: $1 with: $exit_status"
-    fi
-  else
-    log "INFO" "expected to pass..."
-    if [ ! $exit_status -eq 0 ]; then
-      abort "command: $2 failed in section: $1 with: $exit_status"
-    fi
   fi
 
   printf "\\n"
@@ -45,10 +36,10 @@ function enter-section() {
 
 enter-section "Typstyle checking" "./run-fmt.sh --check src/lib.typ" 0
 enter-section "BUILD: ABB code theme" "./generate-theme.sh" 0
-enter-section "Compiling template..." "typst compile template/main.typ --root . example.pdf"
+enter-section "Compiling template..." "typst compile template/main.typ --root . example.pdf" 0
-enter-section "TEST: local template import" "typst compile tests/local-import/main.typ --root ."
+enter-section "TEST: local template import" "typst compile tests/local-import/main.typ --root ." 0
-enter-section "TEST: invalid config case 1" "typst compile tests/invalid-config/test-case-1.typ --root ." "should fail"
+enter-section "TEST: invalid config case 1" "typst compile tests/invalid-config/test-case-1.typ --root ." 1
-enter-section "TEST: invalid config case 2" "typst compile tests/invalid-config/test-case-2.typ --root ."
+enter-section "TEST: invalid config case 2" "compile tests/invalid-config/test-case-2.typ" 0
-enter-section "TEST: invalid config case 3" "typst compile tests/invalid-config/test-case-3.typ --root ." "should fail"
+enter-section "TEST: invalid config case 3" "typst compile tests/invalid-config/test-case-3.typ --root ." 1
 
 log "INFO" "CI completed successfully"

run-fmt.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 function format() {
     # format file

shell.nix

@@ -1,5 +1,5 @@
 let
-  nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-unstable";
+  nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-24.05";
   pkgs = import nixpkgs { config = {}; overlays = []; };
 in
 

tests/invalid-config/test-case-1.typ

@@ -1,7 +1,8 @@
 
 #import "../../src/lib.typ": dhbw-template
 
-#show: dhbw-template.with((
+#show: dhbw-template.with(
+  config: (
     lang: none,
     region: "en",
     author: (

tests/invalid-config/test-case-2.typ

@@ -1,7 +1,8 @@
 
 #import "../../src/lib.typ": dhbw-template
 
-#show: dhbw-template.with((
+#show: dhbw-template.with(
+  config: (
     lang: "en",
     this-key-is-not-in-config: "Ha Ha",
     region: "en",
@@ -14,8 +15,7 @@
       university: "DHBW Mannheim",
       company: "ABB AG",
       supervisor: "Benny Goodman",
-    matriculation-number: 123456789,
+      matriculation-number: 123456789),
-  ),
     thesis: (
       title: "Unofficial ABB/DHBW Typst template",
       subtitle: "for reports and thesises",
@@ -24,9 +24,7 @@
       kind: "T2000",
       summary: none,
       abstract: none,
-    keywords: ("IT", "other stuff"),
+      keywords: ( "IT", "other stuff" ),
       bibliography: none,
       glossary: none,
-    appendices: none,
+      appendices: none)))
-  ),
-))

tests/invalid-config/test-case-3.typ

@@ -1,15 +1,15 @@
 
 #import "../../src/lib.typ": dhbw-template
 
-#show: dhbw-template.with((
+#show: dhbw-template.with(
+  config: (
     lang: "en",
     region: "en",
     author: (
       university: "DHBW Mannheim",
       company: "ABB AG",
       supervisor: none,
-    matriculation-number: 123456789,
+      matriculation-number: 123456789),
-  ),
     thesis: (
       title: "Unofficial ABB/DHBW Typst template",
       subtitle: "for reports and thesises",
@@ -18,9 +18,7 @@
       kind: "T2000",
       summary: none,
       abstract: none,
-    keywords: ("IT", "other stuff"),
+      keywords: ( "IT", "other stuff" ),
       bibliography: none,
       glossary: none,
-    appendices: none,
+      appendices: none)))
-  ),
-))

tests/local-import/main.typ

@@ -1,15 +1,20 @@
 
 #import "../../src/lib.typ": dhbw-template
 
-#show: dhbw-template.with((
+#show: dhbw-template.with(
+  config: (
     lang: "en",
     region: "en",
     author: (
+      name: "Sven Vogel",
+      semester: 4,
+      program: "Informationtechnology",
+      course: "TINF19IT1",
+      faculty: "Technik",
       university: "DHBW Mannheim",
       company: "ABB AG",
-    supervisor: "Vivaldi",
+      supervisor: "Benny Goodman",
-    matriculation-number: 123456789,
+      matriculation-number: 123456789),
-  ),
     thesis: (
       title: "Unofficial ABB/DHBW Typst template",
       subtitle: "for reports and thesises",
@@ -18,9 +23,7 @@
       kind: "T2000",
       summary: none,
       abstract: none,
-    keywords: ("IT", "other stuff"),
+      keywords: ( "IT", "other stuff" ),
       bibliography: none,
       glossary: none,
-    appendices: none,
+      appendices: none)))
-  ),
-))