Support custom plantuml server url

.github/workflows/tests.yml → .github/workflows/ci.yml

@@ -1,5 +1,7 @@
-name: tests
-on: push
+name: CI
+on:
+  push:
+    paths-ignore: ["**/index.js"]
 jobs:
   tests:
     runs-on: ubuntu-latest
@@ -13,7 +15,7 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: 12.x
-      - name: install depedencies
+      - name: install dependencies
         run: npm install
       - name: run tests
         run: "npm run test:ci"
@@ -31,3 +33,26 @@ jobs:
         with:
           codeclimate-test-reporter-id: ${{ secrets.CC_TEST_REPORTER_ID }}
           command: after-build
+  package:
+    runs-on: ubuntu-latest
+    name: package
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+      - name: install node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12.x
+      - name: install dependencies
+        run: npm install
+      - name: Transpile typescript
+        run: "npm run build"
+      - name: Package distribution
+        run: "npm run package"
+      - name: Commit the new distribution
+        uses: EndBug/add-and-commit@v9
+        with:
+          # This makes the GH Actions user/bot the author of the commit
+          default_author: github_actions
+          message: 'Add new distribution'
+          add: "dist/index.js"

.github/workflows/plantuml.yml

@@ -1,19 +1,47 @@
 name: generate plantuml
 on:
+  pull_request:
+    paths:
+      - "dist/index.js"
+      - "action.yml"
+      - "./github/workflows/plantuml.yml"
   push:
     branches:
       - master
 jobs:
   generate_plantuml:
     runs-on: ubuntu-latest
     name: plantuml
+    strategy:
+      matrix:
+        server: ['default', 'local']
+        include:
+          - server: "default"
+            server-url: "http://www.plantuml.com/plantuml"
+            run-container: false
+          - server: "local"
+            server-url: "http://localhost:8080"
+            run-container: true
     steps:
       - name: checkout
         uses: actions/checkout@v2
+      - name: run plantuml server container
+        if: ${{ matrix.run-container }}
+        run: |
+         docker run -d --name plantuml -p 8080:8080 plantuml/plantuml-server:jetty
+
+         echo TEST: Wait until plantuml server container is started
+         timeout 30 bash -c 'while [[ "$(curl -X GET -s -o /dev/null -w ''%{http_code}'' curl localhost:8080/svg/pStDuNBAJrBGjLDmpCbCJbMmKiX8JIp9ICv8JSxcSaZDIm6g0000)" != "200" ]]; do sleep 2; done' || false
       - name: plantuml
         id: plantuml
-        uses: grassedge/generate-plantuml-action@master
+        uses: ./
         with:
           path: example
+          plantuml-server-url: ${{ matrix.server-url }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Clean-up plantuml server
+        if: always() && ${{ matrix.run-container }}
+        run: |
+            docker stop plantuml
+            docker rm plantuml

action.yml

@@ -1,16 +1,22 @@
-name: 'Generate Plantuml'
-description: 'Generate uml diagrams with Plantuml Server and push them to your repository.'
-author: 'grassedge'
-inputs:
-  path:
-    description: 'path to directory which generated svg is stored'
-    default: '.'
-  message:
-    description: 'the commit message when committing generated images'
-    default: 'Render PlantUML files'
-runs:
-  using: 'node12'
-  main: 'dist/index.js'
-branding:
-  icon: 'image'
-  color: 'gray-dark'
+name: 'Generate Plantuml'
+description: 'Generate uml diagrams with Plantuml Server and push them to your repository.'
+author: 'grassedge'
+inputs:
+  plantuml-server-url:
+    description: 'url to the plantuml server'
+    default: 'http://www.plantuml.com/plantuml'
+    required: false
+  path:
+    description: 'path to directory which generated svg is stored'
+    default: '.'
+    required: false
+  message:
+    description: 'the commit message when committing generated images'
+    default: 'Render PlantUML files'
+    required: false
+runs:
+  using: 'node12'
+  main: 'dist/index.js'
+branding:
+  icon: 'image'
+  color: 'gray-dark'

example/sample-activity.pu

@@ -1,5 +1,5 @@
 @startuml
 :Hello world;
-:This is on defined on
+:This is defined on
 several **lines**;
 @enduml