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