From 435ad3d4484db7c232ab12b4b9e7dea057e0e4bf 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: Sat, 19 Oct 2024 23:35:39 +0200 Subject: [PATCH 1/4] Add .gitignore I'm mucking about in IntelliJ and I don't want to clutter the repo. --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9f11b75 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea/ From 1d94142c2a99bbe93b7be3bb7f7b71d8839eda83 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: Sat, 19 Oct 2024 23:36:52 +0200 Subject: [PATCH 2/4] Add pre-commit configuration https://pre-commit.com/ --- .pre-commit-config.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..5a69227 --- /dev/null +++ b/.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 From 46601dc0c71f557b935939abb1fffc0571692792 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: Sat, 19 Oct 2024 23:43:29 +0200 Subject: [PATCH 3/4] Setup Java and Graphviz using Actions - https://github.com/marketplace/actions/setup-java-jdk - https://github.com/marketplace/actions/setup-graphviz --- .gitea/workflows/checkPullRequest.yaml | 15 +++++++++------ .gitea/workflows/render.yaml | 13 ++++++++----- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/checkPullRequest.yaml b/.gitea/workflows/checkPullRequest.yaml index 43d3224..2b24213 100644 --- a/.gitea/workflows/checkPullRequest.yaml +++ b/.gitea/workflows/checkPullRequest.yaml @@ -1,7 +1,7 @@ name: check PR on: pull_request: - types:[opened, reopened, edited] + types: [opened, reopened, edited] jobs: check_render: runs-on: ubuntu-latest @@ -10,9 +10,12 @@ jobs: 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: 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: ./jdk-21.0.3+9-jre/bin/java -jar plantuml-1.2024.5.jar polycule.puml \ No newline at end of file + run: java -jar plantuml-1.2024.5.jar polycule.puml diff --git a/.gitea/workflows/render.yaml b/.gitea/workflows/render.yaml index 3800c77..755c518 100644 --- a/.gitea/workflows/render.yaml +++ b/.gitea/workflows/render.yaml @@ -12,12 +12,15 @@ jobs: 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: 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: ./jdk-21.0.3+9-jre/bin/java -jar plantuml-1.2024.5.jar polycule.puml + run: java -jar plantuml-1.2024.5.jar polycule.puml - name: upload to cdn uses: appleboy/scp-action@v0.1.7 with: From 31f888fe020c253eddc1738e91606d9fcca92752 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: Sat, 19 Oct 2024 23:50:18 +0200 Subject: [PATCH 4/4] Bump version of PlantUML to v1.2024.7 https://github.com/plantuml/plantuml/releases/tag/v1.2024.7 --- .gitea/workflows/checkPullRequest.yaml | 4 ++-- .gitea/workflows/render.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/checkPullRequest.yaml b/.gitea/workflows/checkPullRequest.yaml index 2b24213..9b1e0e9 100644 --- a/.gitea/workflows/checkPullRequest.yaml +++ b/.gitea/workflows/checkPullRequest.yaml @@ -9,7 +9,7 @@ jobs: - 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/v1.2024.7/plantuml-1.2024.7.jar - name: Setup Java uses: actions/setup-java@v4 with: @@ -18,4 +18,4 @@ jobs: - name: Setup Graphviz uses: ts-graphviz/setup-graphviz@v2 - name: render - run: java -jar plantuml-1.2024.5.jar polycule.puml + run: java -jar plantuml-1.2024.7.jar polycule.puml diff --git a/.gitea/workflows/render.yaml b/.gitea/workflows/render.yaml index 755c518..e1b9c9c 100644 --- a/.gitea/workflows/render.yaml +++ b/.gitea/workflows/render.yaml @@ -11,7 +11,7 @@ jobs: - 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/v1.2024.7/plantuml-1.2024.7.jar - name: Setup Java uses: actions/setup-java@v4 with: @@ -20,7 +20,7 @@ jobs: - name: Setup Graphviz uses: ts-graphviz/setup-graphviz@v2 - name: render - run: java -jar plantuml-1.2024.5.jar polycule.puml + run: java -jar plantuml-1.2024.7.jar polycule.puml - name: upload to cdn uses: appleboy/scp-action@v0.1.7 with: