Merge branch 'staging'

kwongtn · Jun 27, 2024 · 122c049 · 122c049
2 parents 4573b7f + 86b6a1a
commit 122c049
Show file tree

Hide file tree

Showing 108 changed files with 5,780 additions and 1,539 deletions.
diff --git a/.github/workflows/firebase-hosting-main.yml b/.github/workflows/firebase-hosting-main.yml
@@ -12,6 +12,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
 
       - uses: actions/setup-node@v3
         with:
@@ -43,4 +45,5 @@ jobs:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_ROSAK_7223B }}"
           channelId: live
+          target: public
           projectId: rosak-7223b
diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
@@ -10,6 +10,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          cache: "npm"
 
       - run: npm ci && npm run buildStaging
         env:
@@ -32,4 +39,4 @@ jobs:
           SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
           # SENTRY_URL: https://sentry.io/
         with:
-          environment: ${{ github.ref_name }}
+          environment: ${{ github.head_ref || github.ref_name }} 
diff --git a/.github/workflows/firebase-hosting-staging.yml b/.github/workflows/firebase-hosting-staging.yml
@@ -12,20 +12,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
 
       - uses: actions/setup-node@v3
         with:
           node-version: 20
           cache: "npm"
 
       - run: npm i -g angular-build-info && npm ci && npm run buildStaging
+        timeout-minutes: 30
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
           SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Create Sentry release
         uses: getsentry/action-release@v1
+        if: always()
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
@@ -35,6 +40,7 @@ jobs:
           environment: staging
 
       - uses: FirebaseExtended/action-hosting-deploy@v0
+        if: always()
         with:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_ROSAK_7223B }}"

diff --git a/angular.json b/angular.json
@@ -18,7 +18,7 @@
             "prefix": "app",
             "architect": {
                 "build": {
-                    "builder": "@angular-devkit/build-angular:browser",
+                    "builder": "@angular-builders/custom-webpack:browser",
                     "options": {
                         "sourceMap": true,
                         "outputPath": "dist/public",
@@ -45,7 +45,10 @@
                             "node_modules/marked/marked.min.js",
                             "node_modules/mermaid/dist/mermaid.min.js",
                             "node_modules/emoji-toolkit/lib/js/joypixels.min.js"
-                        ]
+                        ],
+                        "customWebpackConfig": {
+                            "path": "./webpack.config.js"
+                        }
                     },
                     "configurations": {
                         "production": {
@@ -108,7 +111,7 @@
                     "defaultConfiguration": "production"
                 },
                 "serve": {
-                    "builder": "@angular-devkit/build-angular:dev-server",
+                    "builder": "@angular-builders/custom-webpack:dev-server",
                     "configurations": {
                         "production": {
                             "buildTarget": "public:build:production"
@@ -120,13 +123,13 @@
                     "defaultConfiguration": "development"
                 },
                 "extract-i18n": {
-                    "builder": "@angular-devkit/build-angular:extract-i18n",
+                    "builder": "@angular-builders/custom-webpack:extract-i18n",
                     "options": {
                         "buildTarget": "public:build"
                     }
                 },
                 "test": {
-                    "builder": "@angular-devkit/build-angular:karma",
+                    "builder": "@angular-builders/custom-webpack:karma",
                     "options": {
                         "main": "src/test.ts",
                         "polyfills": "src/polyfills.ts",