fly.io deployment (rebased with slim root.tsx)

codeforboston · Dec 6, 2023 · 2670973 · 2670973
1 parent 4e7a068
commit 2670973
Show file tree

Hide file tree

Showing 6 changed files with 381 additions and 81 deletions.
diff --git a/.github/workflows/heat-stack.yml b/.github/workflows/heat-stack.yml
@@ -3,7 +3,8 @@ on:
   push:
     branches:
       - main
-      # - dev
+      - gha-deployment
+      - dev
   pull_request: {}
 
 env:
@@ -155,46 +156,46 @@ jobs:
   #         path: playwright-report/
   #         retention-days: 30
 
-  # deploy:
-  #   name: 🚀 Deploy
-  #   runs-on: ubuntu-latest
-  #   needs: [lint, typecheck, vitest, playwright]
-  #   # only build/deploy main branch on pushes
-  #   if:
-  #     ${{ (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') &&
-  #     github.event_name == 'push' }}
+  deploy:
+    name: 🚀 Deploy
+    runs-on: ubuntu-latest
+    needs: [lint, typecheck, vitest] #, playwright]
+    # only build/deploy main branch on pushes
+    if:
+      ${{ (github.ref == 'refs/heads/gha-deployment' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') &&
+      github.event_name == 'push' }}
 
-  #   steps:
-  #     - name: ⬇️ Checkout repo
-  #       uses: actions/checkout@v3
+    steps:
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v3
 
-  #     - name: 👀 Read app name
-  #       uses: SebRollen/[email protected]
-  #       id: app_name
-  #       with:
-  #         file: 'fly.toml'
-  #         field: 'app'
-
-      # # move Dockerfile to root
-      # - name: 🚚 Move Dockerfile
-      #   run: |
-      #     mv ./other/Dockerfile ./Dockerfile
-      #     mv ./other/.dockerignore ./.dockerignore
-
-      # - name: 🎈 Setup Fly
-      #   uses: superfly/flyctl-actions/[email protected]
-
-      # - name: 🚀 Deploy Staging
-      #   if: ${{ github.ref == 'refs/heads/dev' }}
-      #   run:
-      #     flyctl deploy --remote-only --build-arg COMMIT_SHA=${{ github.sha }}
-      #     --app ${{ steps.app_name.outputs.value }}-staging
-      #   env:
-      #     FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
-
-      # - name: 🚀 Deploy Production
-      #   if: ${{ github.ref == 'refs/heads/main' }}
-      #   run:
-      #     flyctl deploy --remote-only --build-arg COMMIT_SHA=${{ github.sha }}
-      #   env:
-      #     FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+      - name: 👀 Read app name
+        uses: SebRollen/[email protected]
+        id: app_name
+        with:
+          file: '${{ env.working-directory }}/fly.toml'
+          field: 'app'
+
+      # move Dockerfile to root
+      - name: 🚚 Move Dockerfile
+        run: |
+          mv ./other/Dockerfile ./Dockerfile
+          mv ./other/.dockerignore ./.dockerignore
+
+      - name: 🎈 Setup Fly
+        uses: superfly/flyctl-actions/[email protected]         
+
+      - name: 🚀 Deploy Staging
+        if: ${{ github.ref == 'refs/heads/dev' }}
+        run:
+          flyctl deploy --remote-only --build-arg COMMIT_SHA=${{ github.sha }}
+          --app ${{ steps.app_name.outputs.value }}-staging
+        env:
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+
+      - name: 🚀 Deploy Production
+        if: ${{  github.ref == 'refs/heads/main' || github.ref == 'refs/heads/gha-deployment' }}
+        run:
+          flyctl deploy --remote-only --build-arg COMMIT_SHA=${{ github.sha }}
+        env:
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
diff --git a/heat-stack/app/root.tsx b/heat-stack/app/root.tsx
@@ -1,22 +1,27 @@
 import { cssBundleHref } from '@remix-run/css-bundle'
-import fontStyleSheetUrl from './styles/font.css'
-import tailwindStyleSheetUrl from './styles/tailwind.css'
+import {
+	type DataFunctionArgs,
+	HeadersFunction,
+	json,
+	type LinksFunction,
+} from '@remix-run/node'
 import { Links, Scripts } from '@remix-run/react'
+import { CaseSummary } from './components/CaseSummary.tsx'
 import { href as iconsHref } from './components/ui/icon.tsx'
-import { DataFunctionArgs, HeadersFunction, json, type LinksFunction } from '@remix-run/node'
+import fontStyleSheetUrl from './styles/font.css'
+import tailwindStyleSheetUrl from './styles/tailwind.css'
 
-import { CaseSummary } from './components/CaseSummary.tsx'
 import './App.css'
+import { getUserId } from './utils/auth.server.ts'
+import { getHints } from './utils/client-hints.tsx'
+import { prisma } from './utils/db.server.ts'
+import { getEnv } from './utils/env.server.ts'
+import { combineHeaders, getDomainUrl } from './utils/misc.tsx'
 import { useNonce } from './utils/nonce-provider.ts'
 import { combineServerTimings, makeTimings, time } from './utils/timing.server.ts'
-import { combineHeaders, getDomainUrl } from './utils/misc.tsx'
-import { getEnv } from './utils/env.server.ts'
 // Hints may not be required. Double check.
-import { getHints } from './utils/client-hints.tsx'
 import { WeatherExample } from './components/WeatherExample.tsx'
 import { Weather } from './WeatherExample.js'
-import { getUserId } from './utils/auth.server.ts'
-import { prisma } from './utils/db.server.ts'
 import { csrf } from './utils/csrf.server.ts'
 import { honeypot } from './utils/honeypot.server.ts'