Merge pull request 'Ember - Hellen dating' (#50) from lotte02/polycule:main into main

Reviewed-on: #50

.gitea/workflows/checkPullRequest.yaml

@@ -1,18 +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.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

@@ -0,0 +1,29 @@
+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,33 +1,31 @@
 name: Render diagram
+
 on:
-  push:
+  pull_request:
-    branches:
+    types: [opened, reopened, edited]
-      - main
+  workflow_call:
 
 jobs:
-  Render-Main:
+  render:
     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/v1.2024.5/plantuml-1.2024.5.jar
+        run: wget https://github.com/plantuml/plantuml/releases/download/v${{env.PLANTUML_VERSION}}/plantuml-${{env.PLANTUML_VERSION}}.jar
-      - name: Download java
+      - name: Setup 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
+        uses: actions/setup-java@v4
-      - 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:
-          host: bruynooghe.dev
+          distribution: 'temurin'
-          username: elizhium
+          java-version: '21'
-          password: ${{ secrets.ELIZHIUMPW }}
+      - name: Setup Graphviz
-          port: 22
+        uses: ts-graphviz/setup-graphviz@v2
-          source: "polycule.png, polycule.puml"
+      - name: Render diagram
-          target: "/home/elizhium/CDN"
+        run: java -jar plantuml-${{env.PLANTUML_VERSION}}.jar polycule.puml
-      - uses: actions/upload-artifact@v3
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v3
         with:
-            name: polycule.png
+          name: polycule.png
-            path: polycule.png
+          path: polycule.png

.gitignore

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

.pre-commit-config.yaml

@@ -0,0 +1,23 @@
+---
+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,97 +1,128 @@
 @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"
+circle "Emily-Larra-Sarah"
 'circle Celeste
-circle Kiran
+'circle Kiran
-circle Tinko
+'circle Soda
-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 Ari
 circle Frede
 circle Charlotte
-'circle Emery
 circle Shen
 circle Enya
 circle Kyra
-circle "Charlotte C"
 circle Chloe
-circle Ria
+circle Hester
-'circle Michael
+circle Koen
-circle Francis
+circle Sylvia
+circle Seba
+circle Nina
+circle Sven
+circle Tine
 circle Hannah
+circle Tara
+circle Lara/Lance
+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
 
-
+Elizabeth -- Jenna: Partner
-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
-Talinka .. Jack : Casual
 Rosie -- Ashley : Engaged
 Ashley --  Talinka : Engaged
-Jack .. Joanna : Casual
 Lilia .. Ashley : Casual
 Amber -- Talinka : Partner
 Rosie -- Talinka : Partner
 Alvin -- Talinka : Partner
-Mira .. Talinka : Casual
+Amedee -- Evi : Partner
-Evi .. Amedee : Dating
 Amber -- Ashley : Partner
 Ashley -- Jenna : Partner
-Mira -- Amber : Partner
+Rachel -- Ward : Partner
-Rachel .. Ward : Casual
 Ward -- Kathy : Engaged
 Ward -- Glas : Partner
 Kathy -- Ari : Partner
 Ari -- Frede : Partner
 Mira -- Evi : Partner
-Evi -- Amber : Partner
 Amber -- Charlotte : Partner
 Shen .. Talinka : Casual
-Amedee -- Enya: Partner 
+Amedee -- Enya: Partner
-Enya -- Kyra: Engaged
+Enya -- Kyra: Married
-Amedee .. "Charlotte C": Casual
 Amedee .. Chloe: Casual
-Amedee .. Ria: Casual
+Hester .. Chloe: 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
-Rosie -- Francis: Partner
+Mira -- Hannah : Partner
-Mira .. Hannah : Casual
+Tara -- Mira: Partner
+Tara -- Evi: Partner
+Tara .. Amedee: Casual
+Elizabeth -- "Emily-Larra-Sarah": Partner
+Mira .. Glas: Casual
+Hannah -- "Lara/Lance": Partner
+Helena -- "Lara/Lance": Partner
+Charlotte -- "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  : Casual
+Mira -- "Lara/Lance": 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 : Dating
 
 @enduml