Merge branch 'changes' of https://git.bruynooghe.dev/Elizhium/polycule into changes

.gitea/workflows/checkPullRequest.yaml

@@ -0,0 +1,18 @@
+name: check PR
+on:
+  pull_request:
+    types:[opened, reopened, edited]
+jobs:
+  check_render:
+      runs-on: ubuntu-latest
+      steps:
+        - name: Check out repository code
+          uses: actions/checkout@v4
+        - name: Download renderer
+          run: wget https://github.com/plantuml/plantuml/releases/download/v1.2024.5/plantuml-1.2024.5.jar
+        - name: Download java
+          run: wget https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_linux_hotspot_21.0.3_9.tar.gz; tar -xvzf OpenJDK21U-jre_x64_linux_hotspot_21.0.3_9.tar.gz
+        - name: install graphviz
+          run: sudo add-apt-repository universe; sudo apt update; apt install graphviz -y
+        - name: render
+          run: ./jdk-21.0.3+9-jre/bin/java -jar plantuml-1.2024.5.jar polycule.puml

.gitea/workflows/publish.yaml

@@ -1,29 +0,0 @@
-name: Publish diagram
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  render:
-    uses: ./.gitea/workflows/render.yaml
-
-  publish:
-    needs: render
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Download build artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: polycule.png
-          path: ./
-      - name: Upload to cdn
-        uses: appleboy/scp-action@v0.1.7
-        with:
-          host: bruynooghe.dev
-          username: elizhium
-          password: ${{ secrets.ELIZHIUMPW }}
-          source: "polycule.*"
-          target: "/home/elizhium/CDN"

.gitea/workflows/render.yaml

@@ -1,31 +1,33 @@
 name: Render diagram
-
 on:
-  pull_request:
+  push:
-    types: [opened, reopened, edited]
+    branches:
-  workflow_call:
+      - main
 
 jobs:
-  render:
+  Render-Main:
     runs-on: ubuntu-latest
-    env:
-      PLANTUML_VERSION: '1.2025.0'
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
       - name: Download renderer
-        run: wget https://github.com/plantuml/plantuml/releases/download/v${{env.PLANTUML_VERSION}}/plantuml-${{env.PLANTUML_VERSION}}.jar
+        run: wget https://github.com/plantuml/plantuml/releases/download/v1.2024.5/plantuml-1.2024.5.jar
-      - name: Setup Java
+      - name: Download java
-        uses: actions/setup-java@v4
+        run: wget https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_linux_hotspot_21.0.3_9.tar.gz; tar -xvzf OpenJDK21U-jre_x64_linux_hotspot_21.0.3_9.tar.gz
+      - name: install graphviz
+        run: sudo add-apt-repository universe; sudo apt update; apt install graphviz -y
+      - name: render
+        run: ./jdk-21.0.3+9-jre/bin/java -jar plantuml-1.2024.5.jar polycule.puml
+      - name: upload to cdn
+        uses: appleboy/scp-action@v0.1.7
         with:
-          distribution: 'temurin'
+          host: bruynooghe.dev
-          java-version: '21'
+          username: elizhium
-      - name: Setup Graphviz
+          password: ${{ secrets.ELIZHIUMPW }}
-        uses: ts-graphviz/setup-graphviz@v2
+          port: 22
-      - name: Render diagram
+          source: "polycule.png, polycule.puml"
-        run: java -jar plantuml-${{env.PLANTUML_VERSION}}.jar polycule.puml
+          target: "/home/elizhium/CDN"
-      - name: Upload build artifact
+      - uses: actions/upload-artifact@v3
-        uses: actions/upload-artifact@v3
         with:
-          name: polycule.png
+            name: polycule.png
-          path: polycule.png
+            path: polycule.png

.gitignore

@@ -1 +0,0 @@
-.idea/

.pre-commit-config.yaml

@@ -1,23 +0,0 @@
----
-repos:
-    - repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: v4.6.0
-      hooks:
-          - id: trailing-whitespace
-          - id: end-of-file-fixer
-          - id: check-yaml
-            args: ['--unsafe']
-          - id: check-added-large-files
-    - repo: https://github.com/python-jsonschema/check-jsonschema
-      rev: 0.29.0
-      hooks:
-          - id: check-github-actions
-            args: [--verbose]
-    - repo: https://github.com/rhysd/actionlint
-      rev: v1.7.1
-      hooks:
-          - id: actionlint
-    - repo: https://github.com/jorisroovers/gitlint
-      rev: v0.19.1
-      hooks:
-          - id: gitlint

polycule.puml

@@ -1,134 +1,110 @@
 @startuml
 circle Jenna
 circle Elizabeth
-' circle Bea
+circle Bea
 circle Mira
 circle Rachel
-'circle Evelynn
+circle Evelynn
-'circle Matty
+circle Matty
-'circle Joanna
+circle Joanna
-circle "Emily-Larra-Sarah"
+circle "Emily-Larra"
 'circle Celeste
-'circle Kiran
+circle Kiran
-'circle Soda
+circle Tinko
+circle Michelle
+circle Tara
+circle Soda
+'circle Lira
 circle Evi
-'circle Kiwi
+circle Kiwi
-'circle "Kiwi's polycule"
+circle "Kiwi's polycule"
-'circle Lara
+circle Lara
-'circle Jack
+circle Jack
-'circle Merel
+circle Merel
 circle Rosie
 circle Talinka
 circle Ashley
+circle "Michelles Partner"
 circle Lilia
 circle Amber
 circle Alvin
+'circle Dax
 circle Amedee
+circle Aeryn
 circle Ward
 circle Kathy
-circle glas
+circle Glass
 circle Ari
 circle Frede
-circle "Charlotte/Elva/Layla"
+circle Charlotte
+circle Emery
 circle Shen
 circle Enya
 circle Kyra
+circle "Charlotte C"
 circle Chloe
-circle Hester
+circle Ria
-circle Koen
+circle Michael
-circle Sylvia
+circle Francis
-circle Seba
-circle Nina
-circle Sven
-circle Tine
-circle Hannah
-circle Tara
-circle Everbloom
-circle "Lotte/Ember"
-' circle Laure
-circle Helena
-circle Oriana
-circle Alex
-circle Thomas
-circle Pieter
-circle Anton
-circle Wyvern
-circle Tom
-circle Gwen
-circle Sarah
-circle Nicholas
-circle Hellen
-circle Kris
-circle Nari
-circle Ara
-circle Lisa
 
-Elizabeth -- Jenna: Partner
+
-Mira -- Rachel: Married
+Jenna -- Elizabeth : Partner
+Mira --  Rachel: Married
+Evelynn --  Matty :Partner
+Matty --  Joanna: Partner
+Mira --  Tara: Partner
+"Emily-Larra" --  Kiran: Partner
+Tinko --  Kiran: Partner
+Tara --  Evi: Partner
+Bea --  Kiwi: Partner
+Soda --  Lara: Partner
+"Kiwi's polycule" .. Kiwi
+Jack --  Merel: Partner
+Jack ..  Lara: Casual
+Jack ..  Soda: Casual
+Tinko .. Michelle: Casual
+Michelle .. "Emily-Larra": Casual
+Michelle .. Kiran: Casual
+Elizabeth -- Talinka: Partner
 Jenna -- Talinka : Partner
+Jenna .. Jack : Casual
+Talinka .. Jack : Casual
 Rosie -- Ashley : Engaged
-Ashley -- Talinka : Engaged
+"Emily-Larra" .. Tinko : Casual
+Michelle -- "Michelles Partner" : Partner
+Ashley --  Talinka : Partner
+Jack .. Joanna : Casual
 Lilia .. Ashley : Casual
 Amber -- Talinka : Partner
 Rosie -- Talinka : Partner
 Alvin -- Talinka : Partner
-Amedee -- Evi : Partner
+Mira .. Talinka : Casual
+Evi .. Amedee : Dating
 Amber -- Ashley : Partner
 Ashley -- Jenna : Partner
-Rachel -- Ward : Partner
+Mira -- Amber : Partner
+Tara -- Amber : Partner
+Rachel .. Ward : Casual
 Ward -- Kathy : Engaged
-Ward -- glas : Partner
+Ward -- Glass : Partner
 Kathy -- Ari : Partner
 Ari -- Frede : Partner
 Mira -- Evi : Partner
-Amber -- "Charlotte/Elva/Layla" : Partner
+Tara .. Amedee : Casual
+Tara .. Talinka : Casual
+Evi -- Amber : Partner
+Amber -- Charlotte : Partner
+Charlotte -- Tara : Partner
+Tara -- Emery : Partner
 Shen .. Talinka : Casual
-Amedee -- Enya: Partner
+Amedee -- Enya: Partner 
-Enya -- Kyra: Married
+Enya -- Kyra: Engaged
+Amedee .. "Charlotte C": Casual
 Amedee .. Chloe: Casual
-Hester .. Chloe: Casual
+Amedee .. Ria: Casual
-Hester .. Koen: Casual
-Chloe .. Koen: Casual
-Koen -- Sylvia: Partner
-Hester -- Seba: Partner
-Hester .. Amedee: Situationship
-Koen .. Nina: Casual
-Nina -- Sven: Partner
-Tine .. Nina: Dating
-Tine .. Sven: Dating
 Evi -- Ashley: Partner
-Mira -- Hannah : Partner
+Rosie -- Francis: Partner
-Tara -- Mira: Partner
+Emery -- Michael : Partner
-Tara -- Evi: Partner
+Aeryn .. Talinka : Casual
-Tara .. Amedee: Casual
-Elizabeth -- "Emily-Larra-Sarah": Partner
-Mira .. glas: Casual
-Hannah -- "Everbloom": Partner
-Helena -- "Everbloom": Partner
-"Charlotte/Elva/Layla" -- "Lotte/Ember": Engaged
-"Emily-Larra-Sarah" .. Oriana : Casual
-"Emily-Larra-Sarah" .. Alex : Casual
-Thomas .. Tine: Comet
-Pieter .. Tine: Dating
-Anton .. Tine: Dating
-Rosie -- Wyvern: Partner
-Hester .. Tom
-"Emily-Larra-Sarah" .. "Gwen" : Casual
-"Emily-Larra-Sarah" .. "Lotte/Ember": Casual
-"Emily-Larra-Sarah" .. "Charlotte/Elva/Layla" : Casual
-Mira -- "Everbloom": Partner
-Tara .. Sarah: Casual
-Amber -- Nicholas : Partner
-"Emily-Larra-Sarah" .. Hellen : Casual
-Evi .. Kris : Casual
-Tara .. Gwen: Casual
-Hannah .. Nari : Casual
-Nari -- Ara : Partner
-"Lotte/Ember" -- Hellen : Partner
-Everbloom .. "Emily-Larra-Sarah" : Casual
-Lisa -- Ashley : Partner
-Lisa -- Amber : Partner
-"Charlotte/Elva/Layla" -- Mira : Dating
-"Charlotte/Elva/Layla" -- Aris : Dating
 
 @enduml