From 20169a134d19558661e3bc24bb6ce1b0abbd09ce Mon Sep 17 00:00:00 2001
From: Smith <a-sync@devs.space>
Date: Tue, 12 Dec 2023 17:44:50 +0100
Subject: [PATCH] fix: fly.io github actions support for non lowercase owner
 names

 * fly.io app name rules: Name may only contain numbers, lowercase letters and dashes
---
 .github/workflows/configure.yml | 14 ++++++++++++--
 .github/workflows/create.yml    | 14 ++++++++++++--
 .github/workflows/deploy.yml    | 12 +++++++++++-
 README.md                       |  2 +-
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml
index 84f309d..a5b60e9 100644
--- a/.github/workflows/configure.yml
+++ b/.github/workflows/configure.yml
@@ -87,10 +87,20 @@ jobs:
       - uses: superfly/flyctl-actions/setup-flyctl@master
         if: env.SET_ARGS != '' || env.UNSET_ARGS != ''
 
+      - name: Set app name
+        run: |
+          if [[ -n "${{ secrets.FLY_APP_NAME }}" ]]; then
+            echo "APP_NAME=${{ secrets.FLY_APP_NAME }}" >> $GITHUB_ENV
+          else
+            echo "APP_NAME=${REPO_OWNER,,}-gsw" >> $GITHUB_ENV
+          fi
+        env:
+          REPO_OWNER: '${{ github.repository_owner }}'
+
       - name: 💼 Set secrets on fly.io
         if: env.SET_ARGS != ''
-        run: flyctl secrets set${{ env.SET_ARGS }} --app ${{ github.repository_owner }}-gsw
+        run: flyctl secrets set${{ env.SET_ARGS }} --app ${{ env.APP_NAME }}
 
       - name: 🗑 Unset secrets on fly.io
         if: env.UNSET_ARGS != ''
-        run: flyctl secrets unset${{ env.UNSET_ARGS }} --app ${{ github.repository_owner }}-gsw
+        run: flyctl secrets unset${{ env.UNSET_ARGS }} --app ${{ env.APP_NAME }}
diff --git a/.github/workflows/create.yml b/.github/workflows/create.yml
index f7c704f..910cec8 100644
--- a/.github/workflows/create.yml
+++ b/.github/workflows/create.yml
@@ -12,8 +12,18 @@ jobs:
 
     steps:
       - uses: superfly/flyctl-actions/setup-flyctl@master
+      - name: Set app name
+        run: |
+          if [[ -n "${{ secrets.FLY_APP_NAME }}" ]]; then
+            echo "APP_NAME=${{ secrets.FLY_APP_NAME }}" >> $GITHUB_ENV
+          else
+            echo "APP_NAME=${REPO_OWNER,,}-gsw" >> $GITHUB_ENV
+          fi
+        env:
+          REPO_OWNER: '${{ github.repository_owner }}'
+
       - name: 🧱 Create fly.io app
-        run: flyctl apps create ${{ github.repository_owner }}-gsw --org personal
+        run: flyctl apps create ${{ env.APP_NAME }} --org personal
 
       - name: 💽 Create fly.io volume
-        run: flyctl volumes create gsw_data --size 1 --region ${{ secrets.FLY_REGION }} --app ${{ github.repository_owner }}-gsw --yes
+        run: flyctl volumes create gsw_data --size 1 --region ${{ secrets.FLY_REGION }} --app ${{ env.APP_NAME }} --yes
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 74d7f89..6bf5fc7 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -20,5 +20,15 @@ jobs:
           fetch-depth: 0
 
       - uses: superfly/flyctl-actions/setup-flyctl@master
+      - name: Set app name
+        run: |
+          if [[ -n "${{ secrets.FLY_APP_NAME }}" ]]; then
+            echo "APP_NAME=${{ secrets.FLY_APP_NAME }}" >> $GITHUB_ENV
+          else
+            echo "APP_NAME=${REPO_OWNER,,}-gsw" >> $GITHUB_ENV
+          fi
+        env:
+          REPO_OWNER: '${{ github.repository_owner }}'
+
       - name: 🛩 Deploy to fly.io
-        run: flyctl deploy --remote-only --auto-confirm --region ${{ secrets.FLY_REGION }} --app ${{ github.repository_owner }}-gsw
+        run: flyctl deploy --remote-only --auto-confirm --region ${{ secrets.FLY_REGION }} --app ${{ env.APP_NAME }}
diff --git a/README.md b/README.md
index d41b63f..cf63f71 100644
--- a/README.md
+++ b/README.md
@@ -206,7 +206,7 @@ All other libraries and dependencies are listed in the _package.json file (depen
 * https://github.com/msniveau/discord-statusbot
 * https://github.com/kevinkjt2000/bowser
 * https://github.com/negrifelipe/ServerStatusBot
-* https://gitlab.com/lxndr-ab/gswatcher
+* https://gitlab.com/lxndr/gswatcher
 * https://github.com/Unity-Technologies/qstat
 * https://github.com/GiyoMoon/steam-server-query
 * https://github.com/Fabricio-191/valve-server-query