Compare commits

...

30 Commits

Author SHA1 Message Date
Amedee Van Gasse ✨🌈🦄
5836216cf6 Update Ria relationship status 2024-10-13 16:00:00 +01:00
5dcf8f818c Merge pull request 'Remove a few weak or unconfirmed connections' (#20) from amedee/polycule:remove-unconfirmed into main
Reviewed-on: Elizhium/polycule#20
2024-12-21 09:28:09 +01:00
2dadd3dcdc Merge branch 'main' into remove-unconfirmed 2024-12-21 09:27:49 +01:00
3d34eb9ce8 Merge pull request 'Enya and Kyra got married 2024-11-08!' (#19) from amedee/polycule:main into main
Reviewed-on: Elizhium/polycule#19
2024-12-21 09:27:36 +01:00
ae94473604 Merge branch 'main' into main
Some checks failed
Publish diagram / render (push) Has been cancelled
Publish diagram / publish (push) Has been cancelled
2024-12-21 09:27:13 +01:00
e4a3ac3a15 Update polycule.puml 2024-12-18 13:07:22 +01:00
cb41b36022 Update polycule.puml 2024-12-14 09:16:18 +01:00
Amedee Van Gasse ✨🌈🦄
60446746a6 Remove a few weak or unconfirmed connections 2024-12-01 12:00:00 +01:00
b5c388018c Merge pull request 'rachel-ward-partner' (#18) from tara/polycule:rachel-ward-partner into main
Reviewed-on: Elizhium/polycule#18
2024-11-10 20:15:54 +01:00
Amedee Van Gasse ✨🌈🦄
cecd405173 Enya and Kyra got married 2024-11-08!
Some checks are pending
Publish diagram / render (push) Waiting to run
Publish diagram / publish (push) Blocked by required conditions
2024-11-08 14:00:00 +01:00
990472b89c Rachel and Ward became partbers
Requested by Mira
2024-11-07 20:52:38 +01:00
4af65679d9 Merge pull request 'main' (#17) from amedee/polycule:main into main
Reviewed-on: Elizhium/polycule#17
2024-11-05 19:48:07 +01:00
Amedee Van Gasse ✨🌈🦄
0ce3e28f1e Hester and Jelle are no longer dating
Some checks failed
Publish diagram / render (push) Has been cancelled
Publish diagram / publish (push) Has been cancelled
2024-11-05 17:19:52 +01:00
Amedee Van Gasse ✨🌈🦄
9817bacd3c Simplified some of the weaker connections
+ update after Alexandra's breakups
2024-11-05 17:18:38 +01:00
91e61ac21e Update polycule.puml 2024-11-05 13:59:05 +01:00
3df00ba1f7 Update polycule.puml 2024-11-05 13:57:41 +01:00
e5ee27b4b0 Merge pull request 'Reduce code duplication' (#15) from amedee/polycule:refactor into main
Reviewed-on: Elizhium/polycule#15
2024-10-27 18:52:47 +01:00
27bd5c6e7d Merge branch 'main' into refactor 2024-10-27 18:49:26 +01:00
4498fb996d Merge pull request 'You understand now why they lost their minds and fought the wars' (#16) from tara/polycule:main into main
Reviewed-on: Elizhium/polycule#16
2024-10-27 18:49:07 +01:00
61ecf3eaaf Casual between Amedee and Tara 2024-10-24 18:40:00 +02:00
5673e05ebd You understand now why they lost their minds and fought the wars 2024-10-24 18:07:59 +02:00
Amedee Van Gasse ✨🌈🦄
b6c3e85680 Reduce code duplication
Use reusable workflows
2024-10-20 14:24:09 +02:00
b090427865 Update polycule.puml 2024-10-20 11:35:07 +02:00
cdb6a79e46 Update polycule.puml 2024-10-20 10:40:43 +02:00
d508f34275 Merge pull request 'Add quite a clusterfuck of an update' (#13) from amedee/polycule:clusterfuck into main
Reviewed-on: Elizhium/polycule#13
2024-10-20 10:36:03 +02:00
280a8ee7fe Merge pull request 'Refactor the workflows' (#12) from amedee/polycule:refactor into main
Reviewed-on: Elizhium/polycule#12
2024-10-20 10:31:41 +02:00
Amedee Van Gasse ✨🌈🦄
31f888fe02 Bump version of PlantUML to v1.2024.7
Some checks failed
check PR / check_render (pull_request) Has been cancelled
https://github.com/plantuml/plantuml/releases/tag/v1.2024.7
2024-10-19 23:50:18 +02:00
Amedee Van Gasse ✨🌈🦄
46601dc0c7 Setup Java and Graphviz using Actions
- https://github.com/marketplace/actions/setup-java-jdk
- https://github.com/marketplace/actions/setup-graphviz
2024-10-19 23:43:29 +02:00
Amedee Van Gasse ✨🌈🦄
1d94142c2a Add pre-commit configuration
https://pre-commit.com/
2024-10-19 23:36:52 +02:00
Amedee Van Gasse ✨🌈🦄
435ad3d448 Add .gitignore
I'm mucking about in IntelliJ and I don't want to clutter the repo.
2024-10-19 23:35:39 +02:00
6 changed files with 93 additions and 116 deletions

View File

@@ -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

View File

@@ -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"

View File

@@ -1,33 +1,31 @@
name: Render diagram name: Render diagram
on: on:
push: pull_request:
branches: types: [opened, reopened, edited]
- main workflow_call:
jobs: jobs:
Render-Main: render:
runs-on: ubuntu-latest runs-on: ubuntu-latest
env:
PLANTUML_VERSION: '1.2024.7'
steps: steps:
- name: Check out repository code - name: Check out repository code
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Download renderer - 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: 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: with:
name: polycule.png name: polycule.png
path: polycule.png path: polycule.png

1
.gitignore vendored Normal file
View File

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

23
.pre-commit-config.yaml Normal file
View File

@@ -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

View File

@@ -1,43 +1,35 @@
@startuml @startuml
circle Jenna circle Jenna
circle Elizabeth circle Elizabeth
circle Bea ' circle Bea
circle Mira circle Mira
circle Rachel circle Rachel
circle Evelynn 'circle Evelynn
circle Matty 'circle Matty
circle Joanna circle Joanna
circle "Emily-Larra" circle "Emily-Larra"
'circle Celeste 'circle Celeste
circle Kiran circle Kiran
circle Tinko
circle Michelle
'circle Tara
circle Soda circle Soda
'circle Lira
circle Evi 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 Rosie
circle Talinka circle Talinka
circle Ashley circle Ashley
circle "Michelles Partner"
circle Lilia circle Lilia
circle Amber circle Amber
circle Alvin circle Alvin
'circle Dax
circle Amedee circle Amedee
circle Aeryn
circle Ward circle Ward
circle Kathy circle Kathy
circle Glas circle Glas
circle Ari circle Ari
circle Frede circle Frede
circle Charlotte circle Charlotte
'circle Emery
circle Shen circle Shen
circle Enya circle Enya
circle Kyra circle Kyra
@@ -45,52 +37,31 @@ circle Chloe
circle Ria circle Ria
circle Bart circle Bart
circle Miranda circle Miranda
circle "Miranda's Dom"
circle Els circle Els
circle Paul circle Paul
circle Alexandra
circle Jan
circle Tom
circle Hester circle Hester
circle Koen circle Koen
circle Sylvia circle Sylvia
circle Seba circle Seba
circle Frank
circle CC
circle Pieter circle Pieter
circle "Leuvense supercluster"
circle "Brusselse supercluster"
circle Noud circle Noud
circle Lies circle Lies
circle Inger
circle Aegir
circle "Koppel uit het Noorden"
circle Rosemarie
circle Agnes
circle Nina circle Nina
circle Sven circle Sven
circle Tine circle Tine
circle Peppe
circle Jelle
circle "Jelle's partner"
'circle Michael
circle Francis circle Francis
circle Hannah circle Hannah
circle Tara
circle "Bart 👑"
circle Cristel
Jenna -- Elizabeth : Partner Jenna -- Elizabeth : Partner
Mira -- Rachel: Married Mira -- Rachel: Married
Evelynn -- Matty :Partner 'Evelynn -- Matty :Partner
Matty -- Joanna: Partner
"Emily-Larra" -- Kiran: Partner "Emily-Larra" -- Kiran: Partner
'Tara -- Evi: Engaged
Bea -- Kiwi: Partner
Soda -- Lara: Partner
"Kiwi's polycule" .. Kiwi
Jack -- Merel: Partner Jack -- Merel: Partner
Jack .. Lara: Casual Jack .. Lara: Casual
Jack .. Soda: Casual Jack .. Soda: Casual
Elizabeth -- Talinka: Partner
Jenna -- Talinka : Partner Jenna -- Talinka : Partner
Talinka .. Jack : Casual Talinka .. Jack : Casual
Rosie -- Ashley : Engaged Rosie -- Ashley : Engaged
@@ -105,7 +76,7 @@ Evi .. Amedee : Dating
Amber -- Ashley : Partner Amber -- Ashley : Partner
Ashley -- Jenna : Partner Ashley -- Jenna : Partner
Mira -- Amber : Partner Mira -- Amber : Partner
Rachel .. Ward : Casual Rachel -- Ward : Partner
Ward -- Kathy : Engaged Ward -- Kathy : Engaged
Ward -- Glas : Partner Ward -- Glas : Partner
Kathy -- Ari : Partner Kathy -- Ari : Partner
@@ -115,60 +86,33 @@ Evi -- Amber : Partner
Amber -- Charlotte : Partner Amber -- Charlotte : Partner
Shen .. Talinka : Casual Shen .. Talinka : Casual
Amedee -- Enya: Partner Amedee -- Enya: Partner
Enya -- Kyra: Engaged Enya -- Kyra: Married
Amedee .. Chloe: Casual Amedee .. Chloe: Casual
Amedee .. Ria: Casual Amedee .. Ria: Casual
Ria .. Bart: Dating Ria -- Bart: Partner
Amedee .. Miranda: Casual Amedee .. Miranda: Casual
Miranda .. "Miranda's Dom": D/s
Amedee .. Els: Casual Amedee .. Els: Casual
Els .. Paul: Dating Els .. Paul: Dating
Amedee .. Alexandra: Situationship Chloe .. Hester: Casual
Alexandra .. Jan: Situationship
Alexandra .. Tom: Casual
Amedee .. Hester: Situationship
Hester .. Chloe: Casual
Hester .. Koen: Casual Hester .. Koen: Casual
Chloe .. Koen: Casual Chloe .. Koen: Casual
Chloe .. "Brusselse supercluster": Casual
Koen -- Sylvia: Partner Koen -- Sylvia: Partner
Koen .. "Brusselse supercluster": Casual
Koen .. "Leuvense supercluster": Casual
Hester -- Seba: Partner Hester -- Seba: Partner
Hester .. Frank: D/s
Frank -- CC: D/s
Hester .. Pieter: Casual Hester .. Pieter: Casual
Hester .. "Leuvense supercluster": Casual
Pieter .. "Leuvense supercluster": Dating
Pieter .. "Brusselse supercluster": Dating
Hester .. Noud: Casual Hester .. Noud: Casual
Hester .. Jelle: Casual
Jelle -- "Jelle's partner": Partner
Jelle .. "Leuvense supercluster": Dating
Jelle .. "Brusselse supercluster": Dating
Noud -- Lies: Partner Noud -- Lies: Partner
Noud .. "Leuvense supercluster": Dating Koen .. Nina: Casual
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 -- Sven: Partner
Nina .. Koen: Casual
Nina .. Peppe: Dating
Peppe .. "Brusselse supercluster": Dating
"Leuvense supercluster" .. "Brusselse supercluster": Dating
Tine .. Nina: Dating Tine .. Nina: Dating
Tine .. Sven: Dating Tine .. Sven: Dating
Tine .. "Leuvense supercluster": Casual Tine .. "Bart 👑": Casual
Tine .. "Brusselse supercluster": Casual "Bart 👑" -- Cristel: Partner
Tine .. Amedee: Situationship
Tine .. Chloe: Casual
Tine .. Koen: Casual
Evi -- Ashley: Partner Evi -- Ashley: Partner
Rosie -- Francis: Partner Rosie -- Francis: Partner
Mira .. Hannah : Casual Mira .. Hannah : Casual
Tara -- Mira: Partner
Tara -- Evi: Partner
Tara .. Amedee: Casual
"Emily-Larra" .. Elizabeth: Dating
@enduml @enduml