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 diff --git a/polycule.puml b/polycule.puml index 9b553e4..e91e6cb 100644 --- a/polycule.puml +++ b/polycule.puml @@ -1,19 +1,19 @@ @startuml circle Jenna circle Elizabeth -circle Bea +' circle Bea circle Mira circle Rachel -circle Evelynn -circle Matty +'circle Evelynn +'circle Matty circle Joanna circle "Emily-Larra" 'circle Celeste circle Kiran circle Soda circle Evi -circle Kiwi -circle "Kiwi's polycule" +'circle Kiwi +'circle "Kiwi's polycule" circle Lara circle Jack circle Merel @@ -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,34 +47,23 @@ 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 "Bart 👑" +circle Cristel +circle boomknuffelaar Jenna -- Elizabeth : Partner Mira -- Rachel: Married -Evelynn -- Matty :Partner -Matty -- Joanna: Partner +'Evelynn -- Matty :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 @@ -111,53 +97,27 @@ 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 +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