ci/run-gitea-action-on-pr (#88)

Reviewed-on: #88
Co-authored-by: servostar <sven.vogel123@web.de>
Co-committed-by: servostar <sven.vogel123@web.de>

.gitea/workflows/ci.yml

@@ -1,10 +1,19 @@
-name: Gitea Action for checking typst compilation
+name: Build'n check
 run-name: Performing Typst compilation
-on: [push]
-
+on:
+  push:
+  pull_request:
+    branches:
+      - main
 jobs:
   run-ci-linux:
     runs-on: ubuntu-latest
+    # run action mutally exclusive on PRs or
+    # push with commit containing "Run-Checks"
+    if: >
+      (contains(github.event.head_commit.message, 'Run-Checks') &&
+      github.event_name == 'push') ||
+      github.event_name == 'pull_request'
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3
@@ -16,5 +25,9 @@ jobs:
         uses: cachix/install-nix-action@v27
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - name: Run CI
-        run: nix-shell --run ./run-ci.sh
+      - name: Stylecheck
+        run: nix-shell --run "./run-fmt.sh --check src/lib.typ"
+      - id: build
+        name: Build
+        run: |
+          nix-shell --run ./run-ci.sh

.gitea/workflows/release.yml

@@ -1,34 +0,0 @@
-name: release
-
-on:
-  push:
-    tags:
-      - 'v*.*.*'
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v3
-      - name: Install dependencies for Nix setup action
-        run: |
-          apt update -y
-          apt install sudo -y
-      - name: Setup Nix
-        uses: cachix/install-nix-action@v27
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - name: Run CI
-        run: nix-shell --run ./run-ci.sh
-      - name: Setup go
-        uses: https://github.com/actions/setup-go@v4
-        with:
-          go-version: '>=1.20.1'
-      - name: Create release
-        id: create-release
-        uses: https://gitea.com/actions/release-action@main
-        with:
-          files: |-
-            example.pdf
-          api_key: '${{secrets.RELEASE_TOKEN}}'

.github/workflows/ci.yml

@@ -1,16 +0,0 @@
-name: GitHub Action for checking typst compilation
-run-name: Performing Typst compilation
-on: [push]
-
-jobs:
-  run-ci-linux:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v3
-      - name: Setup Nix
-        uses: cachix/install-nix-action@v27
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - name: Run CI
-        run: nix-shell --run ./run-ci.sh

.github/workflows/release.yml

@@ -1,12 +1,13 @@
-name: release
+name: Build'n check
 
 on:
   push:
-    tags:
-      - 'v*.*.*'
+    branches:
+      - main
 
 jobs:
-  release:
+  build:
+    name: Check Template and Build example
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
@@ -15,16 +16,49 @@ jobs:
         uses: cachix/install-nix-action@v27
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - name: Run CI
-        run: nix-shell --run ./run-ci.sh
+      - name: Stylecheck
+        run: nix-shell --run "./run-fmt.sh --check src/lib.typ"
+      - id: build
+        name: Build
+        run: |
+          nix-shell --run ./run-ci.sh
+      - name: Upload artifact
+        id: artifact-upload
+        uses: actions/upload-artifact@v3
+        with:
+          name: example-document
+          path: ${{ github.workspace }}/example.pdf
+          if-no-files-found: error
+          retention-days: 1
+      - name: Output artifact ID
+        run:  echo 'Artifact ID is ${{ steps.artifact-upload.outputs.artifact-id }}'
+  release:
+    runs-on: ubuntu-latest
+    needs: build
+    if: startsWith(github.ref, 'refs/tags/')
+    permissions:
+      contents: write
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
       - name: Setup go
-        uses: https://github.com/actions/setup-go@v4
+        uses: actions/setup-go@v4
         with:
           go-version: '>=1.20.1'
-      - name: Create release
-        id: create-release
-        uses: https://gitea.com/actions/release-action@main
+      - name: Download Artifcat
+        id: download
+        uses: actions/download-artifact@v3
         with:
-          files: |-
-            example.pdf
-          api_key: '${{secrets.RELEASE_TOKEN}}'
+          name: example-document
+          path: ${{ github.workspace }}/Example.pdf
+      - name: 'Artifact Download Path'
+        run: echo ${{ steps.download.outputs.download-path }}
+      - name: Prepare Release
+        run: echo ${{ github.sha }} > Release.txt
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            Example.pdf
+            Release.txt
+            LICENSE

LICENSE

@@ -2,8 +2,20 @@ MIT License
 
 Copyright (c) 2024 Sven Vogel
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

run-ci.sh

@@ -1,49 +1,3 @@
 #!/bin/bash
 
-function log() {
-  local timestamp=$(date +"%Y-%m-%d %H:%M:%S")
-  echo "$1 at $timestamp: $2"
-}
-
-function abort() {
-  log "ERROR" "test case $1 has failed"
-  exit 1
-}
-
-function print-box() {
-  printf "\\n"
-  echo ".----------------------------------------------------------------."
-  printf "| %-62s |\\n" "$1"
-  echo "'----------------------------------------------------------------'"
-}
-
-function enter-section() {
-  print-box "$1"
-
-  log "INFO" "running task in section $1: $2"
-  log "INFO" "section output following..."
-  printf "\\n"
-
-  eval "$2"
-  exit_status=$?
-
-  if [ "$3" == "should fail" ]; then
-    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"
-  log "INFO" "section $1 completed successfully"
-}
-
-enter-section "Typstyle checking" "./run-fmt.sh --check src/lib.typ" 0
-enter-section "Compiling template..." "typst compile template/main.typ --root . --font-path fonts example.pdf"
-
-log "INFO" "CI completed successfully"
+typst compile template/main.typ --root . --font-path fonts example.pdf

src/glossarium.typ

@@ -199,7 +199,8 @@ SOFTWARE.*/
 
                   #block(
                     below: 1.5em,
-                    par(hanging-indent: 1em)[
+                    width: 100%,
+                    par(hanging-indent: 1em, align(left)[
                       #text(weight: "bold", entry.short)
                       #if hasLong and hasDesc [
                         (#text(entry.long))
@@ -238,7 +239,7 @@ SOFTWARE.*/
                           )
                           .join(", ")
                       }
-                    ],
+                    ]),
                   )
                 ]
               }