Merge branch 'main' into fix-urdu

TryGhost · Oct 3, 2024 · 8f20346 · 8f20346
2 parents 06c8f5f + 52ac218
commit 8f20346
Show file tree

Hide file tree

Showing 177 changed files with 5,700 additions and 1,548 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,10 +5,7 @@ on:
   push:
     branches:
       - main
-      - arch
       - 'v5.*'
-      - 3.x
-      - 2.x
 
 env:
   FORCE_COLOR: 1
@@ -66,8 +63,9 @@ jobs:
         if: github.event_name == 'pull_request'
         run: |
           echo "Looking up: ${{ github.event.pull_request.user.login }}"
+          ENCODED_USERNAME=$(printf '%s' '${{ github.event.pull_request.user.login }}' | jq -sRr @uri)
 
-          LOOKUP_USER=$(curl --write-out "%{http_code}" --silent --output /dev/null --location 'https://api.github.com/orgs/tryghost/members/${{ github.event.pull_request.user.login }}' --header 'Authorization: Bearer ${{ secrets.CANARY_DOCKER_BUILD }}')
+          LOOKUP_USER=$(curl --write-out "%{http_code}" --silent --output /dev/null --location "https://api.github.com/orgs/tryghost/members/$ENCODED_USERNAME" --header "Authorization: Bearer ${{ secrets.CANARY_DOCKER_BUILD }}")
 
           if [ "$LOOKUP_USER" == "204" ]; then
             echo "User is in the org"
@@ -208,7 +206,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 100
+          fetch-depth: 1000
       - uses: actions/setup-node@v4
         env:
           FORCE_COLOR: 0
@@ -241,6 +239,7 @@ jobs:
     if: |
         needs.job_setup.outputs.changed_comments_ui == 'true'
         || needs.job_setup.outputs.changed_signup_form == 'true'
+        || needs.job_setup.outputs.changed_sodo_search == 'true'
         || needs.job_setup.outputs.changed_portal == 'true'
         || needs.job_setup.outputs.changed_core == 'true'
     steps:
@@ -434,7 +433,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 100
+          fetch-depth: 1000
       - uses: actions/setup-node@v4
         env:
           FORCE_COLOR: 0

diff --git a/apps/admin-x-activitypub/package.json b/apps/admin-x-activitypub/package.json
@@ -31,15 +31,10 @@
   "devDependencies": {
     "@playwright/test": "1.46.1",
     "@testing-library/react": "14.3.1",
-    "@tryghost/admin-x-design-system": "0.0.0",
-    "@tryghost/admin-x-framework": "0.0.0",
     "@types/jest": "29.5.12",
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
-    "@radix-ui/react-form": "0.0.3",
     "jest": "29.7.0",
-    "react": "18.3.1",
-    "react-dom": "18.3.1",
     "ts-jest": "29.1.5"
   },
   "nx": {
@@ -67,5 +62,13 @@
         ]
       }
     }
+  },
+  "dependencies": {
+    "@radix-ui/react-form": "0.0.3",
+    "use-debounce": "10.0.3",
+    "@tryghost/admin-x-design-system": "0.0.0",
+    "@tryghost/admin-x-framework": "0.0.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1"
   }
 }