Merge branch 'master' into jw-new-server-tweaks

jwngr · Jun 19, 2024 · e535e43 · e535e43
2 parents 8321e3e + eaee4f0
commit e535e43
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 18 deletions.
diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
@@ -0,0 +1,18 @@
+name: Deploy to Firebase Hosting on merge
+on:
+  push:
+    branches:
+      - master
+jobs:
+  build_and_deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: npm ci && npm run build
+        working-directory: website
+      - uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: ${{ secrets.GITHUB_TOKEN }}
+          firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_SDOW_PROD }}
+          channelId: live
+          projectId: sdow-prod
diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
@@ -0,0 +1,19 @@
+name: Deploy to Firebase Hosting on PR
+on: pull_request
+permissions:
+  checks: write
+  contents: read
+  pull-requests: write
+jobs:
+  build_and_preview:
+    if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: npm ci && npm run build
+        working-directory: website
+      - uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: ${{ secrets.GITHUB_TOKEN }}
+          firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_SDOW_PROD }}
+          projectId: sdow-prod
diff --git a/.github/workflows/frontend-ci.yml b/.github/workflows/frontend-ci.yml
@@ -1,4 +1,4 @@
-name: frontend-ci
+name: Frontend CI
 on: [push]
 jobs:
   frontend-ci:

diff --git a/docs/miscellaneous.md b/docs/miscellaneous.md
@@ -5,20 +5,6 @@
 * [Noteworthy Searches](#noteworthy-searches)
 * [Edge Case Page Titles](#edge-case-page-titles)
 
-## Noteworthy searches
-
-The following is a list of noteworthy searches:
-
-| Search                                                                                                                                                            | Notes                            |
-| ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------- |
-| [Hargrave Military Academy → Illiosentidae](https://www.sixdegreesofwikipedia.com/?source=Hargrave%20Military%20Academy&target=Illiosentidae)                     | Interesting clustered graph      |
-| [Arthropod → Haberdashers' Aske's Boys' School](https://www.sixdegreesofwikipedia.com/?source=Arthropod&target=Haberdashers%27%20Aske%27s%20Boys%27%20School)     | Another cool graph               |
-| [AC power plugs and sockets → Gymnobela abyssorum](https://www.sixdegreesofwikipedia.com/?source=AC%20power%20plugs%20and%20sockets&target=Gymnobela%20abyssorum) | 1,000+ paths of 6 degrees        |
-| [Six Degrees of Kevin Bacon → Phinney](https://www.sixdegreesofwikipedia.com/?source=Six%20Degrees%20of%20Kevin%20Bacon&target=Phinney)                           | 6 paths of 6 degrees (very meta) |
-| [Erlang (programming language) → Barbra Streisand](https://www.sixdegreesofwikipedia.com/?source=Erlang%20%28programming%20language%29&target=Barbra%20Streisand) | 2,000+ paths of 4 degrees        |
-| [Lion Express → Phinney](https://www.sixdegreesofwikipedia.com/?source=Lion%20Express&target=Phinney)                                                             | 9 degrees of separation!         |
-| [2016 French Open → Brachmia melicephala](https://www.sixdegreesofwikipedia.com/?source=2016%20French%20Open&target=Brachmia%20melicephala)                       | Sparse graph of 6 degrees        |
-
 ## Edge case page titles
 
 The following is a collection of edge page titles, mainly used to ensure the project works given a

diff --git a/website/firebase.json → firebase.json b/website/firebase.json → firebase.json
@@ -1,7 +1,11 @@
 {
   "hosting": {
-    "public": "build",
-    "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
+    "public": "website/dist",
+    "ignore": [
+      "firebase.json",
+      "**/.*",
+      "**/node_modules/**"
+    ],
     "headers": [
       {
         "source": "/service-worker.js",

diff --git a/website/.firebaserc b/website/.firebaserc
@@ -3,4 +3,4 @@
     "default": "sdow-prod",
     "staging": "sdow-staging"
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,4 @@ @@
         "default": "sdow-prod",
         "staging": "sdow-staging"
       }
-    }
+    }