Update staging/prod deploy GitHub Actions

.github/workflows/deploy.yml → .github/workflows/deploy.production.yml

@@ -1,15 +1,18 @@
-name: 🚀 Deploy
+name: 🚀 Deploy (production)
 on:
   push:
     branches:
       - main
-      # - dev
-  pull_request:
+    paths-ignore:
+      - "README.md"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+
 jobs:
   lint:
     name: ⬣ ESLint
@@ -71,68 +74,20 @@ jobs:
       - name: ⚡ Run vitest
         run: npm run test -- --coverage
 
-  # cypress:
-  #   name: ⚫️ Cypress
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: ⬇️ Checkout repo
-  #       uses: actions/checkout@v4
-
-  #     - name: 🏄 Copy test env vars
-  #       run: cp .env.example .env
-
-  #     - name: ⎔ Setup node
-  #       uses: actions/setup-node@v4
-  #       with:
-  #         cache: npm
-  #         cache-dependency-path: ./package-lock.json
-  #         node-version: 18
-
-  #     - name: 📥 Install deps
-  #       run: npm install
-
-  #     - name: ⚙️ Build
-  #       run: npm run build
-
-  #     - name: 🌳 Cypress run
-  #       uses: cypress-io/github-action@v3
-  #       with:
-  #         start: npm run start:mocks
-  #         wait-on: http://localhost:8811
-  #       env:
-  #         PORT: 8811
-
   deploy:
     name: 🚀 Deploy
     runs-on: ubuntu-latest
-    # needs: [lint, typecheck, vitest, cypress]
     needs: [lint, typecheck, vitest]
-    # only deploy main/dev branch on pushes
-    if: ${{ (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && github.event_name == 'push' }}
-
     steps:
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v4
 
-      - name: 👀 Read app name
-        uses: SebRollen/[email protected]
-        id: app_name
-        with:
-          file: fly.toml
-          field: app
-
       - 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 }} --app ${{ steps.app_name.outputs.value }}
+        run: flyctl deploy --remote-only --config ./fly.production.toml --build-arg COMMIT_SHA=${{ github.sha }}
         env:
           FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
 

.github/workflows/deploy.staging.yml

@@ -0,0 +1,93 @@
+name: 🚀 Deploy (staging)
+on:
+  push:
+    tags:
+      - stage
+    branches:
+      - dev
+    paths-ignore:
+      - "README.md"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+
+jobs:
+  lint:
+    name: ⬣ ESLint
+    runs-on: ubuntu-latest
+    steps:
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v4
+
+      - name: ⎔ Setup node
+        uses: actions/setup-node@v4
+        with:
+          cache: npm
+          cache-dependency-path: ./package-lock.json
+          node-version: 18
+
+      - name: 📥 Install deps
+        run: npm install
+
+      - name: 🔬 Lint
+        run: npm run lint
+
+  typecheck:
+    name: ʦ TypeScript
+    runs-on: ubuntu-latest
+    steps:
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v4
+
+      - name: ⎔ Setup node
+        uses: actions/setup-node@v4
+        with:
+          cache: npm
+          cache-dependency-path: ./package-lock.json
+          node-version: 18
+
+      - name: 📥 Install deps
+        run: npm install
+
+      - name: 🔎 Type check
+        run: npm run typecheck --if-present
+
+  vitest:
+    name: ⚡ Vitest
+    runs-on: ubuntu-latest
+    steps:
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v4
+
+      - name: ⎔ Setup node
+        uses: actions/setup-node@v4
+        with:
+          cache: npm
+          cache-dependency-path: ./package-lock.json
+          node-version: 18
+
+      - name: 📥 Install deps
+        run: npm install
+
+      - name: ⚡ Run vitest
+        run: npm run test -- --coverage
+
+  deploy:
+    name: 🚀 Deploy
+    runs-on: ubuntu-latest
+    needs: [lint, typecheck, vitest]
+    steps:
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v4
+
+      - name: 🎈 Setup Fly
+        uses: superfly/flyctl-actions/[email protected]
+
+      - name: 🚀 Deploy Staging
+        run: flyctl deploy --remote-only --config ./fly.staging.toml --build-arg COMMIT_SHA=${{ github.sha }} --strategy bluegreen
+        env:
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

fly.production.toml

@@ -0,0 +1,47 @@
+app = "reactrouter"
+
+kill_signal = "SIGINT"
+kill_timeout = 5
+processes = [ ]
+
+[experimental]
+  allowed_public_ports = [ ]
+  auto_rollback = true
+  cmd = "start.sh"
+  entrypoint = "sh"
+
+[[services]]
+  internal_port = 8_080
+  processes = [ "app" ]
+  protocol = "tcp"
+  script_checks = [ ]
+
+  [services.concurrency]
+    hard_limit = 25
+    soft_limit = 20
+    type = "connections"
+
+  [[services.ports]]
+    handlers = [ "http" ]
+    port = 80
+    force_https = true
+
+  [[services.ports]]
+    handlers = [ "tls", "http" ]
+    port = 443
+
+  [[services.tcp_checks]]
+    grace_period = "1s"
+    interval = "15s"
+    restart_limit = 0
+    timeout = "2s"
+
+  [[services.http_checks]]
+    interval = 10_000
+    grace_period = "5s"
+    method = "get"
+    path = "/healthcheck"
+    protocol = "http"
+    timeout = 2_000
+    tls_skip_verify = false
+    headers = { }

fly.staging.toml

@@ -0,0 +1,47 @@
+app = "reactrouterdotcomstaging"
+
+kill_signal = "SIGINT"
+kill_timeout = 5
+processes = [ ]
+
+[experimental]
+  allowed_public_ports = [ ]
+  auto_rollback = true
+  cmd = "start.sh"
+  entrypoint = "sh"
+
+[[services]]
+  internal_port = 8_080
+  processes = [ "app" ]
+  protocol = "tcp"
+  script_checks = [ ]
+
+  [services.concurrency]
+    hard_limit = 25
+    soft_limit = 20
+    type = "connections"
+
+  [[services.ports]]
+    handlers = [ "http" ]
+    port = 80
+    force_https = true
+
+  [[services.ports]]
+    handlers = [ "tls", "http" ]
+    port = 443
+
+  [[services.tcp_checks]]
+    grace_period = "1s"
+    interval = "15s"
+    restart_limit = 0
+    timeout = "2s"
+
+  [[services.http_checks]]
+    interval = 10_000
+    grace_period = "5s"
+    method = "get"
+    path = "/healthcheck"
+    protocol = "http"
+    timeout = 2_000
+    tls_skip_verify = false
+    headers = { }

package.json

@@ -9,7 +9,8 @@
     "lint:fix": "npm run lint -- --fix",
     "start": "remix-serve build/index.js",
     "test": "vitest",
-    "typecheck": "tsc -b"
+    "typecheck": "tsc -b",
+    "push:stage": "git tag -f stage && git push origin stage -f"
   },
   "prettier": {},
   "eslintIgnore": [