chore: bump release version to v0.5.4

Generated-By: servostar

.gitea/workflows/ci.yml

@@ -1,7 +1,13 @@
 name: Build'n check
 run-name: Performing Typst compilation
 on:
+  pull_request:
+      branches:
+        - main
   push:
+    branches-ignore:
+      - main
+
 jobs:
   run-ci-linux:
     runs-on: ubuntu-latest
@@ -9,7 +15,8 @@ jobs:
     # push with commit containing "Run-Checks"
     if: >
       (contains(github.event.head_commit.message, 'Run-Checks') &&
-      github.event_name == 'push')
+      github.event_name == 'push') ||
+      github.event_name == 'pull_request'
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3

.gitea/workflows/prepare.yml

@@ -0,0 +1,38 @@
+name: Create Release Commit
+on:
+  push:
+    branches:
+      - main
+    tags-ignore:
+      - v*.*.*
+jobs:
+  prepare:
+    runs-on: ubuntu-latest
+    if: contains(github.event.head_commit.message, 'Release-As:')
+    env:
+      USERNAME: servostar
+      EMAIL: sven.vogel123@web.de
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
+        with:
+          ref: 'main'
+          token:  ${{ secrets.RELEASE_TOKEN }}
+      - name: Tag Release Commit
+        env:
+          COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
+          GIT_AUTH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        run: |
+          export VERSION=$(echo "${COMMIT_MESSAGE}" | grep -Po '(?<=Release-As: )v\d+\.\d+\.\d+')
+          git config --global user.name "${USERNAME}"
+          git config --global user.email "${EMAIL}"
+          echo "==> Update typst.toml version"
+          sed -i "/version/c\version = \"${VERSION#v}\"" typst.toml
+          git add typst.toml
+          git commit -m "chore: bump release version to $VERSION" -m "Generated-By: ${{ gitea.actor }}"
+          git push origin main
+          echo "::endgroup::"
+          echo "::group::{Tag commit}"
+          git tag -m "Release" "${VERSION}"
+          git push origin "${VERSION}"
+          echo "::endgroup::"

.gitea/workflows/release.yml

@@ -1,10 +1,8 @@
-name: Build'n check
+name: Create Release
 on:
-  pull_request:
+  push:
-    branches:
+    tags:
-      - main
+      - 'v[0-9]+.[0-9]+.[0-9]+'
-    types:
-      - closed
 jobs:
   build:
     name: Check Template and Build example
@@ -39,9 +37,6 @@ jobs:
   release:
     runs-on: ubuntu-latest
     needs: build
-    if: contains(github.event.head_commit.message, 'Release-As:')
-    env:
-      USERNAME: servostar
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3
@@ -59,14 +54,6 @@ jobs:
         run: echo ${{ steps.download.outputs.download-path }}
       - name: Prepare Release
         run: echo ${{ github.sha }} > Release.txt
-      - name: Tag Release Commit
-        run: |
-          echo ${{github.event.head_commit.message}} | grep -Po '(?<=Release-As: )v\d+\.\d+\.\d+' > Version.txt
-          echo "==> Tagging for version: $(cat Version.txt)"
-          git config --global credential.helper store
-          echo "https://${USERNAME}:${{secrets.RELEASE_TOKEN}}}@${{github.repositoryUrl}}" > ~/.git-credentials
-          git tag -m "Release" $(cat Version.txt)
-          git push ${{github.repositoryUrl}} $(cat Version.txt)
       - name: Create release
         id: create-release
         uses: https://gitea.com/actions/release-action@main
@@ -74,6 +61,5 @@ jobs:
           files: |-
             Example.pdf
             Release.txt
-            Version.txt
             LICENSE
           api_key: '${{secrets.RELEASE_TOKEN}}'

CONTRIBUTING.md

@@ -0,0 +1,17 @@
+# Contributing
+
+Development of this template happens at
+[git.montehaselino.de](https://git.montehaselino.de/DHBW/dhbw-abb-typst-template).
+For this reason pull request opened at any mirror such as on GitHub, will not be
+merged as this would compromise the push mirror.
+
+Pull requests shall be opened exclusively in the official
+[repository](https://git.montehaselino.de/DHBW/dhbw-abb-typst-template).
+Issues may be created at GitHub or the official repository.
+Beware, that linked pull requests and issues in commits messages refer to those
+in the official instance and may be broken or invalid on mirrors such as GitHub.
+
+Direct pushes to the `main` branch are discouraged. In order to make a change
+create a new pull request and wait for a maintainer to merge it. Note that in
+order to be able to merge, the continuous integration pipeline must run
+successfully.

README.md

@@ -2,7 +2,7 @@
 <div align="center">
     <h1>DHBW-ABB template for Typst</h1>
     <img src="https://img.shields.io/gitea/last-commit/dhbw/dhbw-abb-typst-template?gitea_url=https%3A%2F%2Fgit.montehaselino.de">
-    <img src="https://img.shields.io/github/actions/workflow/status/Servostar/dhbw-abb-typst-template/ci.yml?label=build">
+    <img src="https://img.shields.io/github/actions/workflow/status/Servostar/dhbw-abb-typst-template/release.yml?label=build">
     <img src="https://img.shields.io/gitea/v/release/dhbw/dhbw-abb-typst-template?gitea_url=https%3A%2F%2Fgit.montehaselino.de&display_name=release">
     <img src="https://img.shields.io/badge/license-MIT-ff0000">
     <img src="https://img.shields.io/badge/Typst-2B9CB0">

src/conf.typ

@@ -24,6 +24,7 @@
       name: "dualen Hochschule Baden-Württemberg",
       campus: "Eppelheim"
     ),
+    supervisor-signature: false,
     authors: (
       (
         name: "Sven Vogel",

src/lib.typ

@@ -122,17 +122,27 @@
 
     #metadata("content terminate") <end-of-content>
 
-    #end_styled(config)[
+    #end_styled(
-      // add bibliography if set
+      config,
-      #if "bibliography" in config.thesis and config.thesis.bibliography != none {
+      context [
-        pagebreak(weak: true)
+        // add bibliography if set
-        counter(page).update(1)
+        #if "bibliography" in config.thesis and config.thesis.bibliography != none {
-        set bibliography(style: "ieee")
+          pagebreak(weak: true)
-        config.thesis.bibliography
+          counter(page).update(1)
-      }
+          set bibliography(
+            style: "ieee",
+            title: if (text.lang == "de") {
+              "Literaturverzeichnis"
+            } else if text.lang == "en" {
+              "Bibliography"
+            },
+          )
+          config.thesis.bibliography
+        }
 
-      // appendix
+        // appendix
-      #show-appendix(config: config)
+        #show-appendix(config: config)
-    ]
+      ],
+    )
   ]
 ]

src/pages/titlepage.typ

@@ -147,22 +147,24 @@
       #context panic("no translation for language: ", text.lang)
     ]
 
-    #align(
+    #if config.supervisor-signature {
-      bottom,
+      align(
-      grid(
+        bottom,
-      // set width of columns
+        grid(
-      // we need two, so make both half the page width
+        // set width of columns
-      columns: (60%, 40%),
+        // we need two, so make both half the page width
-      align(left, if text.lang == "de" [
+        columns: (60%, 40%),
-          Unterschrift des betrieblichen Betreuers
+        align(left, if text.lang == "de" [
-        ] else if text.lang == "en" [
+            Unterschrift des betrieblichen Betreuers
-          Signature of the company supervisor
+          ] else if text.lang == "en" [
-        ] else [
+            Signature of the company supervisor
-          #context panic("no translation for language: ", text.lang)
+          ] else [
-        ]
+            #context panic("no translation for language: ", text.lang)
-      ),
+          ]
-      align(right, {line(length: 6cm)})),
+        ),
-    )
+        align(right, {line(length: 6cm)})),
+      )
+    }
 
     #counter(page).update(0)
   ]

typst.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dhbw-abb-typst-template"
-version = "0.4.1"
+version = "0.5.4"
 entrypoint = "src/template.typ"
 authors = ["Sven Vogel <sven.vogel1@de.abb.com>"]
 license = "MIT"