Reuse common logic in workflows

Author: slowcheetah

.github/workflows/build-web-for-branch.yml

@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  run-on-server:
+  prepare:
     runs-on: ubuntu-latest
 
     steps:
@@ -21,42 +21,15 @@ jobs:
         with:
           ref: ${{ steps.extract_branch.outputs.branch }}
 
-      - name: Copy runner file to remote server
-        uses: garygrossgarten/github-action-scp@0.9.0
-        with:
-          local: website/scripts/runner.mjs
-          remote: /var/www/core-js/runner.mjs
-          host: ${{ secrets.REMOTE_HOST }}
-          username: ci
-          privateKey: ${{ secrets.CI_SSH_KEY }}
-
-      - name: Copy runner wrapper file to remote server
-        uses: garygrossgarten/github-action-scp@0.9.0
-        with:
-          local: website/scripts/runner.sh
-          remote: /var/www/core-js/runner.sh
-          host: ${{ secrets.REMOTE_HOST }}
-          username: ci
-          privateKey: ${{ secrets.CI_SSH_KEY }}
-
-      - name: Copy runner helpers file to remote server
-        uses: garygrossgarten/github-action-scp@0.9.0
-        with:
-          local: website/scripts/helpers.mjs
-          remote: /var/www/core-js/helpers.mjs
-          host: ${{ secrets.REMOTE_HOST }}
-          username: ci
-          privateKey: ${{ secrets.CI_SSH_KEY }}
+  upload-website-builder:
+    uses: ./.github/workflows/upload-web-builder.yml
+    needs: prepare
 
-      - name: Setup SSH
-        uses: webfactory/ssh-agent@v0.9.1
-        with:
-          ssh-private-key: ${{ secrets.CI_SSH_KEY }}
-
-      - name: Make runner.sh executable on remote
-        run: |
-          ssh -o StrictHostKeyChecking=no ci@${{ secrets.REMOTE_HOST }} "chmod +x /var/www/core-js/runner.sh"
+  run-builder:
+    runs-on: ubuntu-latest
+    needs: [prepare, upload-website-builder]
 
+    steps:
       - name: Run node runner.mjs on remote server
         run: |
           ssh -o StrictHostKeyChecking=no ci@${{ secrets.REMOTE_HOST }} "cd /var/www/core-js/ && ./runner.sh ${{ steps.extract_branch.outputs.branch }}"

.github/workflows/build-web.yml

@@ -21,41 +21,8 @@ jobs:
         with:
           ref: ${{ steps.extract_branch.outputs.branch }}
 
-      - name: Copy runner file to remote server
-        uses: garygrossgarten/github-action-scp@0.9.0
-        with:
-          local: website/scripts/runner.mjs
-          remote: /var/www/core-js/runner.mjs
-          host: ${{ secrets.REMOTE_HOST }}
-          username: ci
-          privateKey: ${{ secrets.CI_SSH_KEY }}
-
-      - name: Copy runner wrapper file to remote server
-        uses: garygrossgarten/github-action-scp@0.9.0
-        with:
-          local: website/scripts/runner.sh
-          remote: /var/www/core-js/runner.sh
-          host: ${{ secrets.REMOTE_HOST }}
-          username: ci
-          privateKey: ${{ secrets.CI_SSH_KEY }}
-
-      - name: Copy runner helpers file to remote server
-        uses: garygrossgarten/github-action-scp@0.9.0
-        with:
-          local: website/scripts/helpers.mjs
-          remote: /var/www/core-js/helpers.mjs
-          host: ${{ secrets.REMOTE_HOST }}
-          username: ci
-          privateKey: ${{ secrets.CI_SSH_KEY }}
-
-      - name: Setup SSH
-        uses: webfactory/ssh-agent@v0.9.1
-        with:
-          ssh-private-key: ${{ secrets.CI_SSH_KEY }}
-
-      - name: Make runner.sh executable on remote
-        run: |
-          ssh -o StrictHostKeyChecking=no ci@${{ secrets.REMOTE_HOST }} "chmod +x /var/www/core-js/runner.sh"
+      - name: Upload website builder
+        uses: ./.github/workflows/upload-web-builder.yml
 
       - name: Run node runner.mjs on remote server
         run: |

.github/workflows/upload-web-builder.yml

@@ -0,0 +1,54 @@
+name: Upload website builder
+
+on: workflow_call
+
+jobs:
+  run-on-server:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Extract branch name
+        shell: bash
+        run: echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
+        id: extract_branch
+
+      - name: Checkout code
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ steps.extract_branch.outputs.branch }}
+
+      - name: Copy runner file to remote server
+        uses: garygrossgarten/github-action-scp@0.9.0
+        with:
+          local: website/scripts/runner.mjs
+          remote: /var/www/core-js/runner.mjs
+          host: ${{ secrets.REMOTE_HOST }}
+          username: ci
+          privateKey: ${{ secrets.CI_SSH_KEY }}
+
+      - name: Copy runner wrapper file to remote server
+        uses: garygrossgarten/github-action-scp@0.9.0
+        with:
+          local: website/scripts/runner.sh
+          remote: /var/www/core-js/runner.sh
+          host: ${{ secrets.REMOTE_HOST }}
+          username: ci
+          privateKey: ${{ secrets.CI_SSH_KEY }}
+
+      - name: Copy runner helpers file to remote server
+        uses: garygrossgarten/github-action-scp@0.9.0
+        with:
+          local: website/scripts/helpers.mjs
+          remote: /var/www/core-js/helpers.mjs
+          host: ${{ secrets.REMOTE_HOST }}
+          username: ci
+          privateKey: ${{ secrets.CI_SSH_KEY }}
+
+      - name: Setup SSH
+        uses: webfactory/ssh-agent@v0.9.1
+        with:
+          ssh-private-key: ${{ secrets.CI_SSH_KEY }}
+
+      - name: Make runner.sh executable on remote
+        run: |
+          ssh -o StrictHostKeyChecking=no ci@${{ secrets.REMOTE_HOST }} "chmod +x /var/www/core-js/runner.sh"