From b6c3e8568037e23e164c5e80365a7a1cfaebfb4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amedee=20Van=20Gasse=20=E2=9C=A8=F0=9F=8C=88=F0=9F=A6=84?= Date: Sun, 20 Oct 2024 14:24:09 +0200 Subject: [PATCH 1/5] Reduce code duplication Use reusable workflows --- .gitea/workflows/checkPullRequest.yaml | 21 ---------------- .gitea/workflows/publish.yaml | 29 ++++++++++++++++++++++ .gitea/workflows/render.yaml | 33 +++++++++++--------------- 3 files changed, 43 insertions(+), 40 deletions(-) delete mode 100644 .gitea/workflows/checkPullRequest.yaml create mode 100644 .gitea/workflows/publish.yaml diff --git a/.gitea/workflows/checkPullRequest.yaml b/.gitea/workflows/checkPullRequest.yaml deleted file mode 100644 index 9b1e0e9..0000000 --- a/.gitea/workflows/checkPullRequest.yaml +++ /dev/null @@ -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 diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml new file mode 100644 index 0000000..8bae588 --- /dev/null +++ b/.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" diff --git a/.gitea/workflows/render.yaml b/.gitea/workflows/render.yaml index e1b9c9c..a9cbde8 100644 --- a/.gitea/workflows/render.yaml +++ b/.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.2024.7' 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 -- 2.49.1 From 3df00ba1f72eb7c3bf6d3a055078bee8671e453e Mon Sep 17 00:00:00 2001 From: Elizhium Date: Tue, 5 Nov 2024 13:57:41 +0100 Subject: [PATCH 2/5] Update polycule.puml --- polycule.puml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/polycule.puml b/polycule.puml index 9b553e4..0a944a2 100644 --- a/polycule.puml +++ b/polycule.puml @@ -1,7 +1,7 @@ @startuml circle Jenna circle Elizabeth -circle Bea +' circle Bea circle Mira circle Rachel circle Evelynn @@ -12,8 +12,8 @@ circle "Emily-Larra" circle Kiran circle Soda circle Evi -circle Kiwi -circle "Kiwi's polycule" +'circle Kiwi +'circle "Kiwi's polycule" circle Lara circle Jack circle Merel @@ -72,12 +72,7 @@ circle Tara 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 -- 2.49.1 From 91e61ac21e32a8b15630a4515115702b4ce43ae3 Mon Sep 17 00:00:00 2001 From: Elizhium Date: Tue, 5 Nov 2024 13:59:05 +0100 Subject: [PATCH 3/5] Update polycule.puml --- polycule.puml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/polycule.puml b/polycule.puml index 0a944a2..354a4f8 100644 --- a/polycule.puml +++ b/polycule.puml @@ -4,8 +4,8 @@ circle Elizabeth ' circle Bea circle Mira circle Rachel -circle Evelynn -circle Matty +'circle Evelynn +'circle Matty circle Joanna circle "Emily-Larra" 'circle Celeste @@ -71,7 +71,7 @@ circle Tara Jenna -- Elizabeth : Partner Mira -- Rachel: Married -Evelynn -- Matty :Partner +'Evelynn -- Matty :Partner "Emily-Larra" -- Kiran: Partner Jack -- Merel: Partner Jack .. Lara: Casual -- 2.49.1 From 9817bacd3c3579974633b560e0a23f48e4362d8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amedee=20Van=20Gasse=20=E2=9C=A8=F0=9F=8C=88=F0=9F=A6=84?= Date: Tue, 5 Nov 2024 17:18:38 +0100 Subject: [PATCH 4/5] Simplified some of the weaker connections + update after Alexandra's breakups --- polycule.puml | 51 ++++++++++----------------------------------------- 1 file changed, 10 insertions(+), 41 deletions(-) diff --git a/polycule.puml b/polycule.puml index 354a4f8..ba7b366 100644 --- a/polycule.puml +++ b/polycule.puml @@ -37,12 +37,9 @@ 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 @@ -50,24 +47,20 @@ 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 Valerie circle Francis circle Hannah circle Tara +circle "Bart 👑" +circle Cristel +circle boomknuffelaar Jenna -- Elizabeth : Partner Mira -- Rachel: Married @@ -106,53 +99,29 @@ 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 +Chloe .. Hester: 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 +Jelle -- Valerie: Partner +Hester .. boomknuffelaar: Casual 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 +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 +Tine .. "Bart 👑": Casual +"Bart 👑" -- Cristel: Partner Evi -- Ashley: Partner Rosie -- Francis: Partner Mira .. Hannah : Casual -- 2.49.1 From 0ce3e28f1e87ca82d3618474bc45a80910d4e843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amedee=20Van=20Gasse=20=E2=9C=A8=F0=9F=8C=88=F0=9F=A6=84?= Date: Tue, 5 Nov 2024 17:19:52 +0100 Subject: [PATCH 5/5] Hester and Jelle are no longer dating --- polycule.puml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/polycule.puml b/polycule.puml index ba7b366..e91e6cb 100644 --- a/polycule.puml +++ b/polycule.puml @@ -53,8 +53,6 @@ circle Nina circle Sven circle Tine circle Peppe -circle Jelle -circle Valerie circle Francis circle Hannah circle Tara @@ -111,8 +109,6 @@ Hester .. Frank: D/s Frank -- CC: D/s Hester .. Pieter: Casual Hester .. Noud: Casual -Hester .. Jelle: Casual -Jelle -- Valerie: Partner Hester .. boomknuffelaar: Casual Noud -- Lies: Partner Koen .. Nina: Casual -- 2.49.1