Merge pull request #5 from josh-stillman/js/downmerge-dev

Js/downmerge dev with reusable workflow

.github/workflows/main.yml → .github/workflows/build-deploy.yml

@@ -1,23 +1,15 @@
-name: Deploy Next.js site to AWS
-
 on:
-  # Runs on pushes targeting the default branch
-  push:
-    branches: ["main"]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
-# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
-concurrency:
-  group: "frontend"
-  cancel-in-progress: false
+  workflow_call:
+    inputs:
+      environment:
+        required: true
+        type: string
 
 jobs:
   # Build job
   build-and-deploy:
     runs-on: ubuntu-latest
+    environment: ${{ inputs.environment }}
     env:
       NEXT_PUBLIC_API_URL: ${{ secrets.API_URL }}
     steps:

.github/workflows/dev.yml

@@ -0,0 +1,23 @@
+name: Deploy FE to DEV
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["dev"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "frontend-dev"
+  cancel-in-progress: false
+
+jobs:
+  build-deploy-dev:
+    uses: ./.github/workflows/build-deploy.yml
+    secrets: inherit
+    with:
+      environment: dev
+

.github/workflows/production.yml

@@ -0,0 +1,23 @@
+name: Deploy FE to PROD
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["main"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "frontend-prod"
+  cancel-in-progress: false
+
+jobs:
+  build-deploy-dev:
+    uses: ./.github/workflows/build-deploy.yml
+    secrets: inherit
+    with:
+      environment: production
+

src/app/page.tsx

@@ -10,7 +10,7 @@ export default function Home() {
 
         <Link href="/foobar">go to foobar page!</Link>
       </div>
-
+      <h2>we are in PROD!</h2>
       <NewsFeed />
     </main>
   );