Merge branch 'main' into launchpad/hotwax#63

ymaheshwari1 · Dec 13, 2023 · d9efa47 · d9efa47
2 parents a1a1eb1 + 8dd307b
commit d9efa47
Show file tree

Hide file tree

Showing 9 changed files with 472 additions and 54 deletions.
diff --git a/.firebaserc b/.firebaserc
@@ -1,20 +1,20 @@
 {
   "projects": {
     "dev": "hotwax-digital-commerce",
-    "default": "digital-commerce-71eb8",
+    "default": "hotwax-digital-commerce",
     "production": "digital-commerce-71eb8"
   },
   "targets": {
     "digital-commerce-71eb8": {
       "hosting": {
-        "hotwax-launchpad": [
+        "prod": [
           "hotwax-launchpad"
         ]
       }
     },
     "hotwax-digital-commerce": {
       "hosting": {
-        "hotwax-launchpad-dev": [
+        "dev": [
           "hotwax-launchpad-dev"
         ]
       }

diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
@@ -7,23 +7,10 @@ name: Deploy to Firebase Hosting on merge
     branches:
       - main
 jobs:
-  build_and_deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install Dependencies
-        run: npm install
-      - name: Generate .env file
-        run: cp .env.example .env
-      - name: Build
-        run: npm run build
-      - name: Install Firebase
-        run: npm install -g firebase-tools
-      - name: Set Firebase project
-        run: firebase use default --token "$HOTWAX_PUBLIC_SECRET"
-        env:
-          HOTWAX_PUBLIC_SECRET: ${{ secrets.HOTWAX_PUBLIC_SECRET }}
-      - name: Deploy
-        run: firebase deploy --token "$HOTWAX_PUBLIC_SECRET" -m "Deploying via GitHub actions"  --only hosting:hotwax-launchpad
-        env:
-          HOTWAX_PUBLIC_SECRET: ${{ secrets.HOTWAX_PUBLIC_SECRET }}
+  call-workflow-in-another-repo:
+    uses: hotwax/dxp-components/.github/workflows/common-firebase-hosting-merge.yml@main
+    with:
+      config-path: .github/labeler.yml
+    secrets:
+      envPAT: ${{ secrets.envPAT }}
+      HOTWAX_PUBLIC_SECRET: ${{ secrets.HOTWAX_PUBLIC_SECRET }}
diff --git a/firebase.json b/firebase.json
@@ -1,7 +1,7 @@
 {
     "hosting": [
         {
-          "target": "hotwax-launchpad",
+          "target": "prod",
           "public": "dist",
           "ignore": [
             "firebase.json",
@@ -15,7 +15,7 @@
 
         },
         {
-          "target": "hotwax-launchpad-dev",
+          "target": "dev",
           "public": "dist",
           "ignore": [
             "firebase.json",