updated github actions

bananashell · Nov 19, 2021 · ddd66ca · ddd66ca
1 parent ef74fc4
commit ddd66ca
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 20 deletions.
diff --git a/.env b/.env
@@ -1,8 +0,0 @@
-NEXT_PUBLIC_FIREBASE_API_KEY=AIzaSyDQKNdnFUNdw3yrjTOJKYARZDgaZiaJX88
-NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN=vardagsmaten-87525.firebaseapp.com
-NEXT_PUBLIC_FIREBASE_PROJECT_ID=vardagsmaten-87525
-NEXT_PUBLIC_FIREBASE_STORAGE_BUCKET=vardagsmaten-87525.appspot.com
-NEXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID=961581587146
-NEXT_PUBLIC_FIREBASE_APP_ID=1:961581587146:web:e35d724a81d1648a637233
-NEXT_PUBLIC_FIREBASE_MEASUREMENT_ID=G-N2REMCPBPN
-NEXT_PUBLIC_GOOGLE_ANALYTICS_ID=G-N2REMCPBPN

diff --git a/.env.example b/.env.example
@@ -5,3 +5,4 @@ NEXT_PUBLIC_FIREBASE_STORAGE_BUCKET=
 NEXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID=
 NEXT_PUBLIC_FIREBASE_APP_ID=
 NEXT_PUBLIC_FIREBASE_MEASUREMENT_ID=
+NEXT_PUBLIC_GOOGLE_ANALYTICS_ID
diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
@@ -11,6 +11,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - name: Create env file
+          run: |
+              cat << EOF > .env.production
+              NEXT_PUBLIC_FIREBASE_API_KEY=${{ secrets.FIREBASE_API_KEY }}
+              NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN=${{ secrets.FIREBASE_AUTH_DOMAIN }}
+              NEXT_PUBLIC_FIREBASE_PROJECT_ID=${{ secrets.FIREBASE_PROJECT_ID }}
+              NEXT_PUBLIC_FIREBASE_STORAGE_BUCKET=${{ secrets.FIREBASE_STORAGE_BUCKET }}
+              NEXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID=${{ secrets.FIREBASE_MESSAGING_SENDER_ID }}
+              NEXT_PUBLIC_FIREBASE_APP_ID=${{ secrets.FIREBASE_APP_ID }}
+              NEXT_PUBLIC_FIREBASE_MEASUREMENT_ID=${{ secrets.FIREBASE_MEASUREMENT_ID }}
+              NEXT_PUBLIC_GOOGLE_ANALYTICS_ID=${{ secrets.GOOGLE_ANALYTICS_ID }}
+              EOF
       - run: yarn ci && yarn build
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:

diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
@@ -2,16 +2,28 @@
 # https://github.com/firebase/firebase-tools
 
 name: Deploy to Firebase Hosting on PR
-'on': pull_request
+"on": pull_request
 jobs:
-  build_and_preview:
-    if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - run: yarn ci && yarn build
-      - uses: FirebaseExtended/action-hosting-deploy@v0
-        with:
-          repoToken: '${{ secrets.GITHUB_TOKEN }}'
-          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_VARDAGSMATEN_87525 }}'
-          projectId: vardagsmaten-87525
+    build_and_preview:
+        if: "${{ github.event.pull_request.head.repo.full_name == github.repository }}"
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+            - name: Create env file
+                run: |
+                    cat << EOF > .env.production
+                    NEXT_PUBLIC_FIREBASE_API_KEY=${{ secrets.FIREBASE_API_KEY }}
+                    NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN=${{ secrets.FIREBASE_AUTH_DOMAIN }}
+                    NEXT_PUBLIC_FIREBASE_PROJECT_ID=${{ secrets.FIREBASE_PROJECT_ID }}
+                    NEXT_PUBLIC_FIREBASE_STORAGE_BUCKET=${{ secrets.FIREBASE_STORAGE_BUCKET }}
+                    NEXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID=${{ secrets.FIREBASE_MESSAGING_SENDER_ID }}
+                    NEXT_PUBLIC_FIREBASE_APP_ID=${{ secrets.FIREBASE_APP_ID }}
+                    NEXT_PUBLIC_FIREBASE_MEASUREMENT_ID=${{ secrets.FIREBASE_MEASUREMENT_ID }}
+                    NEXT_PUBLIC_GOOGLE_ANALYTICS_ID=${{ secrets.GOOGLE_ANALYTICS_ID }}
+                    EOF
+            - run: yarn ci && yarn build
+            - uses: FirebaseExtended/action-hosting-deploy@v0
+              with:
+                  repoToken: "${{ secrets.GITHUB_TOKEN }}"
+                  firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_VARDAGSMATEN_87525 }}"
+                  projectId: vardagsmaten-87525