Merge pull request 'Remove my casuals' (#59) from tara/polycule:remove-my-casuals into main

Reviewed-on: Elizhium/polycule#59

.gitea/workflows/checkPullRequest.yaml

@@ -1,21 +0,0 @@
-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.7/plantuml-1.2024.7.jar
-        - name: Setup Java
-          uses: actions/setup-java@v4
-          with:
-            distribution: 'temurin'
-            java-version: '21'
-        - name: Setup Graphviz
-          uses: ts-graphviz/setup-graphviz@v2
-        - name: render
-          run: java -jar plantuml-1.2024.7.jar polycule.puml

.gitea/workflows/publish.yaml

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

.gitea/workflows/render.yaml

@@ -1,17 +1,20 @@
 name: Render diagram
+
 on:
-  push:
-    branches:
-      - main
+  pull_request:
+    types: [opened, reopened, edited]
+  workflow_call:
 
 jobs:
-  Render-Main:
+  render:
     runs-on: ubuntu-latest
+    env:
+      PLANTUML_VERSION: '1.2025.4'
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
       - name: Download renderer
-        run: wget https://github.com/plantuml/plantuml/releases/download/v1.2024.7/plantuml-1.2024.7.jar
+        run: wget https://github.com/plantuml/plantuml/releases/download/v${{env.PLANTUML_VERSION}}/plantuml-${{env.PLANTUML_VERSION}}.jar
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
@@ -19,18 +22,10 @@ jobs:
           java-version: '21'
       - name: Setup Graphviz
         uses: ts-graphviz/setup-graphviz@v2
-      - name: render
-        run: java -jar plantuml-1.2024.7.jar polycule.puml
-      - name: upload to cdn
-        uses: appleboy/scp-action@v0.1.7
+      - name: Render diagram
+        run: java -jar plantuml-${{env.PLANTUML_VERSION}}.jar polycule.puml
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v3
         with:
-          host: bruynooghe.dev
-          username: elizhium
-          password: ${{ secrets.ELIZHIUMPW }}
-          port: 22
-          source: "polycule.png, polycule.puml"
-          target: "/home/elizhium/CDN"
-      - uses: actions/upload-artifact@v3
-        with:
-            name: polycule.png
-            path: polycule.png
+          name: polycule.png
+          path: polycule.png

polycule.puml

@@ -1,22 +1,22 @@
-@startuml
+@startuml polycule
 circle Jenna
 circle Elizabeth
-circle Bea
+' circle Bea
 circle Mira
 circle Rachel
-circle Evelynn
-circle Matty
-circle Joanna
-circle "Emily-Larra"
+'circle Evelynn
+'circle Matty
+'circle Joanna
+circle "Emily-Larra-Sarah"
 'circle Celeste
-circle Kiran
-circle Soda
+'circle Kiran
+'circle Soda
 circle Evi
-circle Kiwi
-circle "Kiwi's polycule"
-circle Lara
-circle Jack
-circle Merel
+'circle Kiwi
+'circle "Kiwi's polycule"
+'circle Lara
+'circle Jack
+'circle Merel
 circle Rosie
 circle Talinka
 circle Ashley
@@ -26,143 +26,107 @@ circle Alvin
 circle Amedee
 circle Ward
 circle Kathy
-circle Glas
+circle glas
 circle Ari
 circle Frede
-circle Charlotte
+circle "Charlotte/Elva/Layla"
 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 Thomas
+circle Pieter
+circle Anton
+circle Wyvern
+circle Tom
+circle Gwen
+circle Nicholas
+circle Hellen
+circle Kris
+circle Nari
+circle Ara
+circle Lisa
+circle Amy
+circle Aris
 
-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
+Elizabeth -- Jenna: Partner
+Mira -- Rachel: Married
 Jenna -- Talinka : Partner
-Talinka .. Jack : Casual
-Rosie -- Ashley : Engaged
-Ashley --  Talinka : Engaged
-Jack .. Joanna : Casual
+Ashley -- Talinka : Engaged
 Lilia .. Ashley : Casual
 Amber -- Talinka : Partner
-Rosie -- Talinka : Partner
+Rosie -- Talinka : Engaged
 Alvin -- Talinka : Partner
-Mira .. Talinka : Casual
-Evi .. Amedee : Dating
+Amedee -- Evi : Partner
 Amber -- Ashley : Partner
 Ashley -- Jenna : Partner
-Mira -- Amber : Partner
-Rachel .. Ward : Casual
+Rachel -- Ward : Partner
 Ward -- Kathy : Engaged
-Ward -- Glas : Partner
+Ward -- glas : Partner
 Kathy -- Ari : Partner
 Ari -- Frede : Partner
 Mira -- Evi : Partner
-Evi -- Amber : Partner
-Amber -- Charlotte : Partner
+Amber -- "Charlotte/Elva/Layla" : Partner
 Shen .. Talinka : Casual
 Amedee -- Enya: Partner
-Enya -- Kyra: Engaged
+Enya -- Kyra: Married
 Amedee .. Chloe: Casual
-Amedee .. Ria: Casual
-Ria .. Bart: Dating
-Amedee .. Miranda: Casual
-Miranda .. "Miranda's Dom": D/s
-Amedee .. Els: Casual
-Els .. Paul: Dating
-Amedee .. Alexandra: Situationship
-Alexandra .. Jan: Situationship
-Alexandra .. Tom: Casual
-Amedee .. Hester: Situationship
 Hester .. Chloe: Casual
 Hester .. Koen: Casual
 Chloe .. Koen: Casual
-Chloe .. "Brusselse supercluster": Casual
 Koen -- Sylvia: Partner
-Koen .. "Brusselse supercluster": Casual
-Koen .. "Leuvense supercluster": Casual
 Hester -- Seba: Partner
-Hester .. Frank: D/s
-Frank -- CC: D/s
-Hester .. Pieter: Casual
-Hester .. "Leuvense supercluster": Casual
-Pieter .. "Leuvense supercluster": Dating
-Pieter .. "Brusselse supercluster": Dating
-Hester .. Noud: Casual
-Hester .. Jelle: Casual
-Jelle -- "Jelle's partner": Partner
-Jelle .. "Leuvense supercluster": Dating
-Jelle .. "Brusselse supercluster": Dating
-Noud -- Lies: Partner
-Noud .. "Leuvense supercluster": Dating
-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
+Hester .. Amedee: Situationship
+Koen .. 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
+Mira -- Hannah : Partner
 Tara -- Mira: Partner
 Tara -- Evi: Partner
-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
+Amber -- Nicholas : Partner
+"Emily-Larra-Sarah" .. Hellen : Casual
+Evi .. Kris : Casual
+Hannah .. Nari : Casual
+Nari -- Ara : Partner
+"Lotte/Ember" -- Hellen : Partner
+Everbloom .. "Emily-Larra-Sarah" : Casual
+Lisa -- Ashley : Partner
+Lisa -- Amber : Partner
+Everbloom -- Amy : Partner
+"Charlotte/Elva/Layla" -- Mira : Dating
+"Charlotte/Elva/Layla" -- Aris : Dating
+Talinka .. Wyvern : Casual
 
 @enduml