Manav Rathi 1 rok temu
rodzic
commit
39228270c1

+ 1 - 1
.github/workflows/web-deploy-accounts.yml

@@ -24,7 +24,7 @@ jobs:
               with:
                   node-version: 20
                   cache: "yarn"
-                  cache-dependency-path: "docs/yarn.lock"
+                  cache-dependency-path: "web/yarn.lock"
 
             - name: Install dependencies
               run: yarn install

+ 1 - 1
.github/workflows/web-deploy-auth.yml

@@ -24,7 +24,7 @@ jobs:
               with:
                   node-version: 20
                   cache: "yarn"
-                  cache-dependency-path: "docs/yarn.lock"
+                  cache-dependency-path: "web/yarn.lock"
 
             - name: Install dependencies
               run: yarn install

+ 1 - 1
.github/workflows/web-deploy-cast.yml

@@ -24,7 +24,7 @@ jobs:
               with:
                   node-version: 20
                   cache: "yarn"
-                  cache-dependency-path: "docs/yarn.lock"
+                  cache-dependency-path: "web/yarn.lock"
 
             - name: Install dependencies
               run: yarn install

+ 1 - 1
.github/workflows/web-deploy-payments.yml

@@ -24,7 +24,7 @@ jobs:
               with:
                   node-version: 20
                   cache: "yarn"
-                  cache-dependency-path: "docs/yarn.lock"
+                  cache-dependency-path: "web/yarn.lock"
 
             - name: Install dependencies
               run: yarn install

+ 1 - 1
.github/workflows/web-deploy-photos.yml

@@ -24,7 +24,7 @@ jobs:
               with:
                   node-version: 20
                   cache: "yarn"
-                  cache-dependency-path: "docs/yarn.lock"
+                  cache-dependency-path: "web/yarn.lock"
 
             - name: Install dependencies
               run: yarn install

+ 48 - 0
.github/workflows/web-deploy-staff.yml

@@ -0,0 +1,48 @@
+name: "Deploy (staff)"
+
+on:
+    # Run on every push to main that changes web/apps/staff/
+    push:
+        branches: [main]
+        paths:
+            - "web/apps/staff/**"
+            - ".github/workflows/web-deploy-staff.yml"
+    # Also allow manually running the workflow
+    workflow_dispatch:
+
+jobs:
+    deploy:
+        runs-on: ubuntu-latest
+
+        defaults:
+            run:
+                working-directory: web
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+              with:
+                  submodules: recursive
+
+            - name: Setup node and enable yarn caching
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 20
+                  cache: "yarn"
+                  cache-dependency-path: "web/yarn.lock"
+
+            - name: Install dependencies
+              run: yarn install
+
+            - name: Build staff
+              run: yarn build:staff
+
+            - name: Publish staff
+              uses: cloudflare/pages-action@1
+              with:
+                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+                  apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+                  projectName: ente
+                  branch: deploy/staff
+                  directory: web/apps/staff/dist
+                  wranglerVersion: "3"

+ 1 - 1
.github/workflows/web-nightly.yml

@@ -34,7 +34,7 @@ jobs:
               with:
                   node-version: 20
                   cache: "yarn"
-                  cache-dependency-path: "docs/yarn.lock"
+                  cache-dependency-path: "web/yarn.lock"
 
             - name: Install dependencies
               run: yarn install

+ 1 - 1
.github/workflows/web-preview.yml

@@ -34,7 +34,7 @@ jobs:
               with:
                   node-version: 20
                   cache: "yarn"
-                  cache-dependency-path: "docs/yarn.lock"
+                  cache-dependency-path: "web/yarn.lock"
 
             - name: Install dependencies
               run: yarn install

+ 5 - 0
web/apps/staff/README.md

@@ -1,3 +1,8 @@
 ## Staff dashboard
 
 Web app for staff members to help with support etc.
+
+### Deployment
+
+The app gets redeployed whenever a PR is merged into main. See
+[docs/deploy.md](../../docs/deploy.md) for more details.

+ 18 - 17
web/docs/deploy.md

@@ -29,21 +29,22 @@ and publish to [web.ente.io](https://web.ente.io).
 Here is a list of all the deployments, whether or not they are production
 deployments, and the action that triggers them:
 
-| URL                                          | Type       | Deployment action                           |
-| -------------------------------------------- | ---------- | ------------------------------------------- |
-| [web.ente.io](https://web.ente.io)           | Production | Push to `deploy/photos`                     |
-| [photos.ente.io](https://photos.ente.io)     | Production | Alias of [web.ente.io](https://web.ente.io) |
-| [auth.ente.io](https://auth.ente.io)         | Production | Push to `deploy/auth`                       |
-| [accounts.ente.io](https://accounts.ente.io) | Production | Push to `deploy/accounts`                   |
-| [cast.ente.io](https://cast.ente.io)         | Production | Push to `deploy/cast`                       |
-| [payments.ente.io](https://payments.ente.io) | Production | Push to `deploy/payments`                   |
-| [help.ente.io](https://help.ente.io)         | Production | Push to `main` + changes in `docs/`         |
-| [accounts.ente.sh](https://accounts.ente.sh) | Preview    | Nightly deploy of `main`                    |
-| [auth.ente.sh](https://auth.ente.sh)         | Preview    | Nightly deploy of `main`                    |
-| [cast.ente.sh](https://cast.ente.sh)         | Preview    | Nightly deploy of `main`                    |
-| [payments.ente.sh](https://payments.ente.sh) | Preview    | Nightly deploy of `main`                    |
-| [photos.ente.sh](https://photos.ente.sh)     | Preview    | Nightly deploy of `main`                    |
-| [preview.ente.sh](https://preview.ente.sh)   | Preview    | Manually triggered                          |
+| URL                                          | Type       | Deployment action                            |
+| -------------------------------------------- | ---------- | ---------------------------------------------|
+| [web.ente.io](https://web.ente.io)           | Production | Push to `deploy/photos`                      |
+| [photos.ente.io](https://photos.ente.io)     | Production | Alias of [web.ente.io](https://web.ente.io)  |
+| [auth.ente.io](https://auth.ente.io)         | Production | Push to `deploy/auth`                        |
+| [accounts.ente.io](https://accounts.ente.io) | Production | Push to `deploy/accounts`                    |
+| [cast.ente.io](https://cast.ente.io)         | Production | Push to `deploy/cast`                        |
+| [payments.ente.io](https://payments.ente.io) | Production | Push to `deploy/payments`                    |
+| [help.ente.io](https://help.ente.io)         | Production | Push to `main` + changes in `docs/`          |
+| [staff.ente.io](https://staff.ente.io)       | Production | Push to `main` + changes in `web/apps/staff` |
+| [accounts.ente.sh](https://accounts.ente.sh) | Preview    | Nightly deploy of `main`                     |
+| [auth.ente.sh](https://auth.ente.sh)         | Preview    | Nightly deploy of `main`                     |
+| [cast.ente.sh](https://cast.ente.sh)         | Preview    | Nightly deploy of `main`                     |
+| [payments.ente.sh](https://payments.ente.sh) | Preview    | Nightly deploy of `main`                     |
+| [photos.ente.sh](https://photos.ente.sh)     | Preview    | Nightly deploy of `main`                     |
+| [preview.ente.sh](https://preview.ente.sh)   | Preview    | Manually triggered                           |
 
 ### Other subdomains
 
@@ -54,8 +55,8 @@ Apart from this, there are also some other deployments:
     `albums.ente.io`, it redirects to the `/shared-albums` page (Enhancement:
     serve it as a separate app with a smaller bundle size).
 
--   `family.ente.io` is currently in a separate repositories (Enhancement: bring
-    them in here).
+-   `family.ente.io` is currently in a separate repository (Enhancement: bring
+    it in here).
 
 ### Preview deployments