Enya and Kyra got married 2014-11-08!

But importanter: reorganize chart so that lines no longer cross
2024-11-11 04:33:32 +01:00
4 changed files with 101 additions and 97 deletions
--- a/.gitea/workflows/publish.yaml
+++ b/.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
        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"
--- a/.gitea/workflows/render.yaml
+++ b/.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
--- a/.pre-commit-config.yaml
+++ b/.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
--- a/polycule.puml
+++ b/polycule.puml
@@ -1,22 +1,16 @@
-@startuml polycule
+@startuml
 circle Jenna
 circle Elizabeth
-' circle Bea
 circle Mira
 circle Rachel
-'circle Evelynn
-'circle Matty
-'circle Joanna
-circle "Emily-Larra-Sarah"
-'circle Celeste
-'circle Kiran
-'circle Soda
+circle Joanna
+circle "Emily-Larra"
+circle Kiran
+circle Soda
 circle Evi
-'circle Kiwi
-'circle "Kiwi's polycule"
-'circle Lara
-'circle Jack
-'circle Merel
+circle Lara
+circle Jack
+circle Merel
 circle Rosie
 circle Talinka
 circle Ashley
@@ -26,87 +20,107 @@ 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 Els
+circle Paul
+circle Alexandra
+circle Hester
+circle Koen
+circle Sylvia
+circle Seba
+circle Frank
+circle CC
+circle Pieter
+circle Noud
+circle Lies
+circle Nina
+circle Sven
+circle "Tine ⏰🏠"
+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
+circle "Bart 👑"
+circle Cristel
+circle boomknuffelaar
+circle Tom
+circle Mieke
+circle "Tine 👩‍⚕️"

-Mira -- Rachel: Married
+Jenna -- Elizabeth : Partner
+Rachel -- Mira : Married
+"Emily-Larra" --  Kiran : Partner
+Jack -- Merel : Partner
+Jack .. Lara : Casual
+Jack .. Soda : Casual
+Elizabeth -- Talinka : Partner
 Jenna -- Talinka : Partner
+Jack .. Talinka : Casual
+Rosie -- Ashley : Engaged
 Ashley --  Talinka : Engaged
-Lilia .. Ashley : Casual
+Jack .. Joanna : Casual
+Ashley .. Lilia : Casual
 Amber -- Talinka : Partner
-Rosie -- Talinka : Engaged
+Rosie -- Talinka : Partner
 Alvin -- Talinka : Partner
-Amedee -- Evi : Partner
+Talinka .. Mira : Casual
+Evi .. Amedee : Dating
 Amber -- Ashley : Partner
 Ashley -- Jenna : Partner
+Mira -- Amber : Partner
 Rachel -- Ward : Partner
-Ward -- Kathy : Engaged
-Ward -- glas : Partner
+Kathy -- Ward : Engaged
+Glas -- Ward : Partner
 Kathy -- Ari : Partner
-Ari -- Frede : Partner
+Frede -- Ari : Partner
 Mira -- Evi : Partner
-Amber -- "Charlotte/Elva/Layla" : Partner
+Evi -- Amber : Partner
+Charlotte -- Amber : Partner
 Shen .. Talinka : Casual
-Amedee -- Enya: Partner
-Enya -- Kyra: Married
-Mira -- Hannah : Partner
-Tara -- Evi: Partner
-Elizabeth -- "Emily-Larra-Sarah": Partner
-Hannah -- "Everbloom": Engaged
-"Charlotte/Elva/Layla" -- "Lotte/Ember": Engaged
-"Emily-Larra-Sarah" .. Oriana : Casual
-"Emily-Larra-Sarah" .. Alex : Casual
-Rosie -- Wyvern: Partner
-"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
-Hannah -- Amy : Partner
-Mira .. Amy : Casual
-"Charlotte/Elva/Layla" -- Mira : Dating
-"Charlotte/Elva/Layla" -- Aris : Dating
-Talinka .. Wyvern : Casual
-Mira .. Oriana : Casual
-Mira -- Lexi : Dating
-Oriana .. Ara : Casual
-Ara .. Gwen : Casual
-Amedee -- Liesbet : Dating
-Liesbet -- Maxim : Partner
+Enya -- Amedee : Partner
+Enya -- Kyra : Married
+Amedee .. Chloe : Casual
+Amedee .. Ria : Casual
+Ria -- Bart : Partner
+Amedee .. Miranda : Casual
+Els .. Amedee : Casual
+Els .. Paul : Dating
+Alexandra .. Amedee : Situationship
+Tom .. Alexandra : Casual
+Tom -- Mieke : Partner
+Chloe .. Hester : Casual
+Hester .. Koen : Casual
+Chloe .. Koen : Casual
+Koen -- Sylvia : Partner
+Hester -- Seba : Partner
+Frank .. Hester : D/s
+CC -- Frank : D/s
+Hester .. Pieter : Casual
+Noud .. Hester : Casual
+Noud -- Lies : Partner
+Hester .. boomknuffelaar : Casual
+Koen .. Nina : Casual
+Nina -- Sven : Partner
+"Tine ⏰🏠" .. Nina : Dating
+"Tine ⏰🏠" .. Sven : Dating
+"Tine ⏰🏠" .. "Bart 👑" : Casual
+"Bart 👑" -- Cristel : Partner
+Evi -- Ashley : Partner
+Rosie -- Francis : Partner
+Mira .. Hannah : Casual
+Tara -- Mira : Partner
+Evi -- Tara : Partner
+Tara .. Amedee : Casual
+"Tine 👩‍⚕️" .. Koen : Casual
+Amedee .. "Tine 👩‍⚕️" : Casual

@enduml