ci: remove run condition for CI on push on main

.gitea/workflows/ci.yml

@@ -1,13 +1,7 @@
 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
@@ -15,8 +9,7 @@ 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

@@ -1,38 +0,0 @@
-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,8 +1,10 @@
-name: Create Release
+name: Build'n check
 on:
-  push:
+  pull_request:
-    tags:
+    branches:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
+      - main
+    types:
+      - closed
 jobs:
   build:
     name: Check Template and Build example
@@ -37,6 +39,9 @@ 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
@@ -54,6 +59,14 @@ 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
@@ -61,5 +74,6 @@ jobs:
           files: |-
             Example.pdf
             Release.txt
+            Version.txt
             LICENSE
           api_key: '${{secrets.RELEASE_TOKEN}}'

CONTRIBUTING.md

@@ -1,17 +0,0 @@
-# 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/release.yml?label=build">
+    <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/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,7 +24,6 @@
       name: "dualen Hochschule Baden-Württemberg",
       campus: "Eppelheim"
     ),
-    supervisor-signature: false,
     authors: (
       (
         name: "Sven Vogel",

src/lib.typ

@@ -122,27 +122,17 @@
 
     #metadata("content terminate") <end-of-content>
 
-    #end_styled(
+    #end_styled(config)[
-      config,
+      // add bibliography if set
-      context [
+      #if "bibliography" in config.thesis and config.thesis.bibliography != none {
-        // add bibliography if set
+        pagebreak(weak: true)
-        #if "bibliography" in config.thesis and config.thesis.bibliography != none {
+        counter(page).update(1)
-          pagebreak(weak: true)
+        set bibliography(style: "ieee")
-          counter(page).update(1)
+        config.thesis.bibliography
-          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,24 +147,22 @@
       #context panic("no translation for language: ", text.lang)
     ]
 
-    #if config.supervisor-signature {
+    #align(
-      align(
+      bottom,
-        bottom,
+      grid(
-        grid(
+      // set width of columns
-        // set width of columns
+      // we need two, so make both half the page width
-        // we need two, so make both half the page width
+      columns: (60%, 40%),
-        columns: (60%, 40%),
+      align(left, if text.lang == "de" [
-        align(left, if text.lang == "de" [
+          Unterschrift des betrieblichen Betreuers
-            Unterschrift des betrieblichen Betreuers
+        ] else if text.lang == "en" [
-          ] else if text.lang == "en" [
+          Signature of the company supervisor
-            Signature of the company supervisor
+        ] else [
-          ] else [
+          #context panic("no translation for language: ", text.lang)
-            #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.5.4"
+version = "0.4.1"
 entrypoint = "src/template.typ"
 authors = ["Sven Vogel <sven.vogel1@de.abb.com>"]
 license = "MIT"