fix: Add .env.staging and fix workflow build

hpi-studyu · Jul 5, 2022 · 5f6138a · 5f6138a
1 parent 827ebba
commit 5f6138a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
@@ -6,7 +6,6 @@ name: Deploy to Firebase Hosting on merge
   push:
     branches:
       - dev
-      - dev-designer_v2
 jobs:
   build_and_deploy:
     runs-on: ubuntu-latest
@@ -23,7 +22,7 @@ jobs:
       - name: "Bootstrap Workspace"
         run: melos bootstrap
       - name: "Build Web"
-        run: melos run build:web:staging --no-select
+        run: melos run build:web --no-select
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
           repoToken: '${{ secrets.GITHUB_TOKEN }}'

diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
@@ -20,7 +20,7 @@ jobs:
       - name: "Bootstrap Workspace"
         run: melos bootstrap
       - name: "Build Web"
-        run: melos run build:web:staging --no-select
+        run: melos run build:web --no-select
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
           repoToken: '${{ secrets.GITHUB_TOKEN }}'

diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml
@@ -25,4 +25,5 @@ flutter:
   assets:
     - packages/studyu_flutter_common/envs/.env
     - packages/studyu_flutter_common/envs/.env.local
+    - packages/studyu_flutter_common/envs/.env.staging
     - packages/studyu_flutter_common/envs/.env.selfhost
diff --git a/melos.yaml b/melos.yaml
@@ -98,7 +98,7 @@ scripts:
     run: |
       melos exec -c 2 --fail-fast -- \
         "flutter build web --web-renderer auto --no-tree-shake-icons --dart-define=ENV=.env.staging"
-    description: Build app staging for Web.
+    description: Build web staging.
     select-package:
       dir-exists: web