From 0e8ce1d7a731810bd3ede5839d5df4ed47c7d693 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= <interface@p3k.org>
Date: Fri, 31 May 2024 12:38:01 +0200
Subject: [PATCH] Slightly reconfigure, reword and format workflow config

---
 .github/workflows/stage.yml   | 50 +++++++++++++++++++++++++++++++++++
 .github/workflows/staging.yml | 50 -----------------------------------
 2 files changed, 50 insertions(+), 50 deletions(-)
 create mode 100644 .github/workflows/stage.yml
 delete mode 100644 .github/workflows/staging.yml

diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml
new file mode 100644
index 00000000..af3e3b17
--- /dev/null
+++ b/.github/workflows/stage.yml
@@ -0,0 +1,50 @@
+name: Deploy (Staging)
+
+on:
+  workflow_dispatch
+
+env:
+  SSH_AUTH_SOCK: /tmp/ssh-agent.sock
+
+jobs:
+  stage:
+    runs-on: ubuntu-latest
+
+    environment:
+      name: stage
+      url: https://antville-test.click
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Build with Gradle
+        run: ./gradlew installDist
+
+      - name: Set up SSH agent
+        run: |
+          ssh-agent -a $SSH_AUTH_SOCK > /dev/null
+          ssh-add - <<< "${{ secrets.SSH_PRIVATE_KEY }}"
+          mkdir -p ~/.ssh
+          echo '${{ vars.SSH_CONFIG }}' > ~/.ssh/config
+          echo '${{ vars.KNOWN_HOSTS }}' > ~/.ssh/known_hosts
+
+      - name: Publish to staging server
+        run: |
+          rsync build/install/helma/ antville.dev:/ \
+            --verbose --archive --delete --compress \
+            --filter 'protect /lib/ext' \
+            --filter '+ /launcher.jar' \
+            --filter '+ /lib' \
+            --filter '- /*' \
+
+      - name: Restart Helma
+        run: ssh antville.dev restart
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
deleted file mode 100644
index 254d9892..00000000
--- a/.github/workflows/staging.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Staging
-
-on:
-  workflow_dispatch
-
-env:
-  SSH_AUTH_SOCK: /tmp/ssh-agent.sock
-
-jobs:
-  install:
-    runs-on: ubuntu-latest
-
-    environment:
-      name: staging
-      url: https://antville-test.click
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Set up Java
-      uses: actions/setup-java@v4
-      with:
-        distribution: temurin
-        java-version: 21
-
-    - name: Set up Gradle
-      uses: gradle/actions/setup-gradle@v3
-
-    - name: Build with Gradle
-      run: ./gradlew installDist
-
-    - name: Set up SSH agent
-      run: |
-        ssh-agent -a $SSH_AUTH_SOCK > /dev/null
-        ssh-add - <<< "${{ secrets.SSH_PRIVATE_KEY }}"
-        mkdir -p ~/.ssh
-        echo '${{ vars.SSH_CONFIG }}' > ~/.ssh/config
-        echo '${{ vars.KNOWN_HOSTS }}' > ~/.ssh/known_hosts
-
-    - name: Publish to staging server
-      run: |
-        rsync build/install/helma/ antville.dev:/ \
-          --verbose --archive --delete --compress \
-          --filter '+ launcher.jar' \
-          --filter '+ lib' \
-          --filter '+ *.jar' \
-          --filter '- *' \
-
-    - name: Restart Helma
-      run: ssh antville.dev restart