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?=
 <amedee-polycule@amedee.be>
Date: Sat, 19 Oct 2024 23:43:29 +0200
Subject: [PATCH] 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: