From 46cddad98a1285ce69ecec87e302c3f8ba6867d5 Mon Sep 17 00:00:00 2001
From: Matthew R Kasun <mkasun@nusak.ca>
Date: Wed, 26 Jul 2023 16:17:01 -0400
Subject: [PATCH] ensure branch test servers available after test runs (#2467)

* save server name to env

* free server always; add PR to discord messages
---
 .github/workflows/deletedroplets.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/deletedroplets.yml b/.github/workflows/deletedroplets.yml
index 2be81983..986b9a06 100644
--- a/.github/workflows/deletedroplets.yml
+++ b/.github/workflows/deletedroplets.yml
@@ -19,6 +19,12 @@ jobs:
       - name: get server name
         run: |
           echo "SERVER=$(cat ./server/server)" >> $GITHUB_ENV
+      - name: get PR
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          echo "pull_request=$(gh api -H 'Accept: application/vnd.github+json' -H 'X-Github-Api-Version: 2022-11-28' \
+            /repos/${{ github.repository}}/actions/runs/${{ github.event.workflow_run.id }} | jq .pull_requests[0].number)" >> $GITHUB_ENV
       - name: discord success message
         uses: appleboy/discord-action@master
         with:
@@ -40,6 +46,7 @@ jobs:
           DIGITALOCEAN_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }}
           TAG: ${{ github.event.workflow_run.id }}-${{ github.event.workflow_run.run_attempt }}
       - name: mark server as available
+        if: success() || failure()
         uses: appleboy/ssh-action@master
         with:
           host: server.${{ env.SERVER }}.clustercat.com
@@ -60,6 +67,12 @@ jobs:
       - name: get server name
         run: |
           echo "SERVER=$(cat ./server/server)" >> $GITHUB_ENV
+      - name: get PR
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          echo "pull_request=$(gh api -H 'Accept: application/vnd.github+json' -H 'X-Github-Api-Version: 2022-11-28' \
+            /repos/${{ github.repository}}/actions/runs/${{ github.event.workflow_run.id }} | jq .pull_requests[0].number)" >> $GITHUB_ENV
       - name: discord failure message
         uses: appleboy/discord-action@master
         with:
@@ -90,6 +103,7 @@ jobs:
           DIGITALOCEAN_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }}
           TAG: ${{ github.event.workflow_run.id }}-${{ github.event.workflow_run.run_attempt }}
       - name: mark server as available
+        if: success() || failure()
         uses: appleboy/ssh-action@master
         with:
           host: server.${{ env.SERVER }}.clustercat.com