Reduce code duplication

Use reusable workflows

.gitea/workflows/publish.yaml

@@ -1,7 +1,6 @@
----
 name: Publish diagram
 
-on: # yamllint disable-line rule:truthy
+on:
   push:
     branches:
       - main
@@ -15,20 +14,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
       - name: Download build artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: polycule.png
           path: ./
-      - name: copy puml to workspace
-        run: ls
       - name: Upload to cdn
-        uses: appleboy/scp-action@ff85246acaad7bdce478db94a363cd2bf7c90345 # v1.0.0
+        uses: appleboy/scp-action@v0.1.7
         with:
           host: bruynooghe.dev
           username: elizhium
           password: ${{ secrets.ELIZHIUMPW }}
-          source: "polycule.puml, polycule.png"
+          source: "polycule.*"
           target: "/home/elizhium/CDN"

.gitea/workflows/render.yaml

@@ -1,7 +1,6 @@
----
 name: Render diagram
 
-on: # yamllint disable-line rule:truthy
+on:
   pull_request:
     types: [opened, reopened, edited]
   workflow_call:
@@ -10,7 +9,7 @@ jobs:
   render:
     runs-on: ubuntu-latest
     env:
-      PLANTUML_VERSION: '1.2025.10'
+      PLANTUML_VERSION: '1.2024.7'
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
@@ -26,7 +25,7 @@ jobs:
       - name: Render diagram
         run: java -jar plantuml-${{env.PLANTUML_VERSION}}.jar polycule.puml
       - name: Upload build artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: polycule.png
           path: polycule.png

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 ---
 repos:
     - repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: v6.0.0
+      rev: v4.6.0
       hooks:
           - id: trailing-whitespace
           - id: end-of-file-fixer
@@ -9,19 +9,15 @@ repos:
             args: ['--unsafe']
           - id: check-added-large-files
     - repo: https://github.com/python-jsonschema/check-jsonschema
-      rev: 0.35.0
+      rev: 0.29.0
       hooks:
           - id: check-github-actions
             args: [--verbose]
     - repo: https://github.com/rhysd/actionlint
-      rev: v1.7.9
+      rev: v1.7.1
       hooks:
           - id: actionlint
     - repo: https://github.com/jorisroovers/gitlint
       rev: v0.19.1
       hooks:
           - id: gitlint
-    - repo: https://gitlab.com/vojko.pribudic.foss/pre-commit-update
-      rev: v0.9.0
-      hooks:
-        - id: pre-commit-update

polycule.puml

@@ -1,22 +1,22 @@
-@startuml polycule
+@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 Soda
 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
@@ -26,87 +26,140 @@ circle Alvin
 circle Amedee
 circle Ward
 circle Kathy
-circle glas
+circle Glas
 circle Ari
 circle Frede
-circle "Charlotte/Elva/Layla"
+circle Charlotte
 circle Shen
 circle Enya
 circle Kyra
+circle Chloe
+circle Ria
+circle Bart
+circle Miranda
+circle "Miranda's Dom"
+circle Els
+circle Paul
+circle Alexandra
+circle Jan
+circle Tom
+circle Hester
+circle Koen
+circle Sylvia
+circle Seba
+circle Frank
+circle CC
+circle Pieter
+circle "Leuvense supercluster"
+circle "Brusselse supercluster"
+circle Noud
+circle Lies
+circle Inger
+circle Aegir
+circle "Koppel uit het Noorden"
+circle Rosemarie
+circle Agnes
+circle Nina
+circle Sven
+circle Tine
+circle Peppe
+circle Jelle
+circle "Jelle's partner"
+circle Francis
 circle Hannah
-circle Tara
-circle Everbloom
-circle "Lotte/Ember"
-' circle Laure
-' circle Helena
-circle Oriana
-circle Alex
-circle Wyvern
-circle Gwen
-circle Nicholas
-circle Hellen
-circle Kris
-circle Nari
-circle Ara
-circle Lisa
-circle Amy
-circle Aris
-circle Lexi
-circle Liesbet
-circle Maxim
 
-Mira -- Rachel: Married
+
+Jenna -- Elizabeth : Partner
+Mira --  Rachel: Married
+Evelynn --  Matty :Partner
+Matty --  Joanna: Partner
+"Emily-Larra" --  Kiran: Partner
+'Tara --  Evi: Engaged
+Bea --  Kiwi: Partner
+Soda --  Lara: Partner
+"Kiwi's polycule" .. Kiwi
+Jack --  Merel: Partner
+Jack ..  Lara: Casual
+Jack ..  Soda: Casual
+Elizabeth -- Talinka: Partner
 Jenna -- Talinka : Partner
-Ashley -- Talinka : Engaged
+Talinka .. Jack : Casual
+Rosie -- Ashley : Engaged
+Ashley --  Talinka : Engaged
+Jack .. Joanna : Casual
 Lilia .. Ashley : Casual
 Amber -- Talinka : Partner
-Rosie -- Talinka : Engaged
+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
+Rachel .. Ward : Casual
 Ward -- Kathy : Engaged
-Ward -- glas : Partner
+Ward -- Glas : Partner
 Kathy -- Ari : Partner
 Ari -- Frede : Partner
 Mira -- Evi : Partner
-Amber -- "Charlotte/Elva/Layla" : Partner
+Evi -- Amber : Partner
+Amber -- Charlotte : Partner
 Shen .. Talinka : Casual
 Amedee -- Enya: Partner
-Enya -- Kyra: Married
+Enya -- Kyra: Engaged
-Mira -- Hannah : Partner
+Amedee .. Chloe: Casual
-Tara -- Evi: Partner
+Amedee .. Ria: Casual
-Elizabeth -- "Emily-Larra-Sarah": Partner
+Ria .. Bart: Dating
-Hannah -- "Everbloom": Engaged
+Amedee .. Miranda: Casual
-"Charlotte/Elva/Layla" -- "Lotte/Ember": Engaged
+Miranda .. "Miranda's Dom": D/s
-"Emily-Larra-Sarah" .. Oriana : Casual
+Amedee .. Els: Casual
-"Emily-Larra-Sarah" .. Alex : Casual
+Els .. Paul: Dating
-Rosie -- Wyvern: Partner
+Amedee .. Alexandra: Situationship
-"Emily-Larra-Sarah" .. "Gwen" : Casual
+Alexandra .. Jan: Situationship
-"Emily-Larra-Sarah" .. "Lotte/Ember": Casual
+Alexandra .. Tom: Casual
-"Emily-Larra-Sarah" .. "Charlotte/Elva/Layla" : Casual
+Amedee .. Hester: Situationship
-Mira -- "Everbloom": Partner
+Hester .. Chloe: Casual
-Amber -- Nicholas : Partner
+Hester .. Koen: Casual
-"Emily-Larra-Sarah" .. Hellen : Casual
+Chloe .. Koen: Casual
-Evi .. Kris : Casual
+Chloe .. "Brusselse supercluster": Casual
-Hannah .. Nari : Casual
+Koen -- Sylvia: Partner
-Nari -- Ara : Partner
+Koen .. "Brusselse supercluster": Casual
-"Lotte/Ember" -- Hellen : Partner
+Koen .. "Leuvense supercluster": Casual
-Everbloom .. "Emily-Larra-Sarah" : Casual
+Hester -- Seba: Partner
-Lisa -- Ashley : Partner
+Hester .. Frank: D/s
-Lisa -- Amber : Partner
+Frank -- CC: D/s
-Everbloom -- Amy : Partner
+Hester .. Pieter: Casual
-Hannah -- Amy : Partner
+Hester .. "Leuvense supercluster": Casual
-Mira .. Amy : Casual
+Pieter .. "Leuvense supercluster": Dating
-"Charlotte/Elva/Layla" -- Mira : Dating
+Pieter .. "Brusselse supercluster": Dating
-"Charlotte/Elva/Layla" -- Aris : Dating
+Hester .. Noud: Casual
-Talinka .. Wyvern : Casual
+Hester .. Jelle: Casual
-Mira .. Oriana : Casual
+Jelle -- "Jelle's partner": Partner
-Mira -- Lexi : Dating
+Jelle .. "Leuvense supercluster": Dating
-Oriana .. Ara : Casual
+Jelle .. "Brusselse supercluster": Dating
-Ara .. Gwen : Casual
+Noud -- Lies: Partner
-Amedee -- Liesbet : Dating
+Noud .. "Leuvense supercluster": Dating
-Liesbet -- Maxim : Partner
+Lies .. "Leuvense supercluster": Dating
+Amedee .. Inger: Casual
+Inger .. Aegir: Casual
+Inger ..  "Koppel uit het Noorden": Casual
+Inger .. Rosemarie: Dating
+Rosemarie -- Agnes: Engaged
+Amedee .. Nina: Casual
+Nina -- Sven: Partner
+Nina .. Koen: Casual
+Nina .. Peppe: Dating
+Peppe .. "Brusselse supercluster": Dating
+"Leuvense supercluster" .. "Brusselse supercluster": Dating
+Tine .. Nina: Dating
+Tine .. Sven: Dating
+Tine .. "Leuvense supercluster": Casual
+Tine .. "Brusselse supercluster": Casual
+Tine .. Amedee: Situationship
+Tine .. Chloe: Casual
+Tine .. Koen: Casual
+Evi -- Ashley: Partner
+Rosie -- Francis: Partner
+Mira .. Hannah : Casual
 
 @enduml