fix(fly-deploy.yml): cache deployment, deploy with build secret

Author: vimscientist69

.github/workflows/fly-deploy.yml

@@ -1,18 +1,34 @@
-# See https://fly.io/docs/app-guides/continuous-deployment-with-github-actions/
-
 name: Fly Deploy
+
 on:
   push:
     branches:
       - main
+
 jobs:
   deploy:
     name: Deploy app
-    runs-on: ubuntu-latest
-    concurrency: deploy-group    # optional: ensure only one action runs at a time
+    runs-on: blacksmith-4vcpu-ubuntu-2404
+    concurrency: deploy-group
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - uses: SwiftyLab/setup-swift@latest
+        with:
+          swift-version: "6.1"
+
+      - name: Get Cache
+        uses: useblacksmith/cache@v5
+        id: autoscaler-build
+        with:
+          key: deploy-cache-${{ hashFiles('SeleniumGridNodeMachineAutoscaler/Package.resolved') }}
+          path: SeleniumGridNodeMachineAutoscaler/.build
+
       - uses: superfly/flyctl-actions/setup-flyctl@master
-      - run: flyctl deploy --remote-only
+      - name: Deploy App
+        run: |
+          echo "GH_SSH_AUTHENTICATION_TOKEN: ${{ secrets.GH_SSH_AUTHENTICATION_TOKEN }}"
+          cd ./SeleniumGridNodeMachineAutoscaler && npm run deploy -- ./SeleniumGridNodeMachineAutoscaler/ --config=./infra/autoscaler.toml --build-secret GITHUB_SSH_AUTHENTICATION_TOKEN=${{ secrets.GH_SSH_AUTHENTICATION_TOKEN }}
         env:
           FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

SeleniumGridNodeMachineAutoscaler/.gitignore

@@ -9,5 +9,4 @@ db.sqlite
 .env
 .env.*
 !.env.example
-.build-secrets
 infra/GITHUB_SSH_AUTHENTICATION_TOKEN

SeleniumGridNodeMachineAutoscaler/Dockerfile

@@ -12,6 +12,10 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
 # Set up a build area
 WORKDIR /build
 
+RUN --mount=type=secret,id=GITHUB_SSH_AUTHENTICATION_TOKEN \
+    TOKEN=$(cat /run/secrets/GITHUB_SSH_AUTHENTICATION_TOKEN) && \
+    git config --global url."https://x-access-token:${TOKEN}@github.com/".insteadOf "https://github.com/"
+
 # First just resolve dependencies.
 # This creates a cached layer that can be reused
 # as long as your Package.swift/Package.resolved
@@ -20,12 +24,6 @@ COPY ./Package.* ./
 RUN swift package resolve \
     $([ -f ./Package.resolved ] && echo "--force-resolved-versions" || true)
 
-RUN --mount=type=secret,id=GITHUB_SSH_AUTHENTICATION_TOKEN \
-    echo "machine github.com login x password $(head -n 1 /run/secrets/GITHUB_SSH_AUTHENTICATION_TOKEN)" && \
-    git config \
-    --global \
-    url."https://${GITHUB_ID}:${GITHUB_SSH_AUTHENTICATION_TOKEN}@github.com/".insteadOf \
-    "https://github.com/"
 
 # Copy entire repo into container
 COPY . .

SeleniumGridNodeMachineAutoscaler/Package.swift

@@ -11,7 +11,7 @@ let package = Package(
         .package(url: "https://github.com/vapor/vapor.git", from: "4.115.0"),
         // 🔵 Non-blocking, event-driven networking for Swift. Used for custom executors
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.65.0"),
-        .package(url: "https://github.com/GetAutomaApp/AutomaUtilities", branch: "main"),
+        .package(url: "https://github.com/GetAutomaApp/AutomaUtilities.git", branch: "main"),
     ],
     targets: [
         .executableTarget(

package.json

@@ -15,7 +15,7 @@
     "autoscaler:creator": "cd ./SeleniumGridNodeMachineAutoscaler/ ; swift run SeleniumGridNodeMachineAutoscaler autocreator",
     "autoscaler:off_machines_destroyer": "cd ./SeleniumGridNodeMachineAutoscaler/ ; swift run SeleniumGridNodeMachineAutoscaler autodestroyer offMachines",
     "autoscaler:old_machines_destroyer": "cd ./SeleniumGridNodeMachineAutoscaler/ ; swift run SeleniumGridNodeMachineAutoscaler autodestroyer oldMachines",
-    "deploy": "fly deploy --ha=false",
+    "deploy": "flyctl deploy --ha=false",
     "deploy:autoscaler": "cd ./SeleniumGridNodeMachineAutoscaler && npm run deploy -- ./SeleniumGridNodeMachineAutoscaler/ --config=./infra/autoscaler.toml --build-secret GITHUB_SSH_AUTHENTICATION_TOKEN=$(cat ./infra/GITHUB_SSH_AUTHENTICATION_TOKEN)"
   },
   "repository": {