Merge branch 'main' into feat/oauth-server

AppFlowy-IO · Oct 3, 2024 · 99bbb09 · 99bbb09
2 parents da5833e + 56f8f39
commit 99bbb09
Show file tree

Hide file tree

Showing 40 changed files with 1,262 additions and 92 deletions.
diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml
@@ -51,7 +51,7 @@ jobs:
           echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login --username appflowyinc --password-stdin
           docker push appflowyinc/appflowy_cloud:${GITHUB_SHA}
           docker push appflowyinc/appflowy_history:${GITHUB_SHA}
-          APPFLOWY_HISTORY_VERSION=${GITHUB_SHA} 
+          APPFLOWY_HISTORY_VERSION=${GITHUB_SHA}
           APPFLOWY_CLOUD_VERSION=0.1.1
 
   test:
@@ -93,6 +93,7 @@ jobs:
           sed -i "s|LOCAL_AI_AWS_SECRET_ACCESS_KEY=.*|LOCAL_AI_AWS_SECRET_ACCESS_KEY=${{ secrets.LOCAL_AI_AWS_SECRET_ACCESS_KEY }}|" .env
           sed -i 's|APPFLOWY_INDEXER_REDIS_URL=.*|APPFLOWY_INDEXER_REDIS_URL=redis://localhost:6379|' .env
           sed -i 's|APPFLOWY_INDEXER_DATABASE_URL=.*|APPFLOWY_INDEXER_DATABASE_URL=postgres://postgres:password@localhost:5432/postgres|' .env
+          sed -i 's|APPFLOWY_WEB_URL=.*|APPFLOWY_WEB_URL=http://localhost:3000|' .env
         shell: bash
 
       - name: Update Nginx Configuration
@@ -125,4 +126,4 @@ jobs:
       - name: Remove Docker Images from Docker Hub
         run: |
           TOKEN=$(curl -s -H "Content-Type: application/json" -X POST -d '{"username": "appflowyinc", "password": "${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}"}' https://hub.docker.com/v2/users/login/ | jq -r .token)
-          curl -s -X DELETE -H "Authorization: JWT ${TOKEN}" https://hub.docker.com/v2/repositories/appflowyinc/${{ matrix.test_service }}/tags/${GITHUB_SHA}/
+          curl -s -X DELETE -H "Authorization: JWT ${TOKEN}" https://hub.docker.com/v2/repositories/appflowyinc/${{ matrix.test_service }}/tags/${GITHUB_SHA}/
diff --git a/...8de543c15f2aa0318dac2d10c5f1ef0f0232.json → ...386ea1566e45e31acd5fb51886aabcd98479.json b/...8de543c15f2aa0318dac2d10c5f1ef0f0232.json → ...386ea1566e45e31acd5fb51886aabcd98479.json
diff --git a/...66d55f43d63f5c1c9e6786a4e80b52b4c5df.json → ...cdfa3a642d2b7276c2a81f877a6217a0d473.json b/...66d55f43d63f5c1c9e6786a4e80b52b4c5df.json → ...cdfa3a642d2b7276c2a81f877a6217a0d473.json
diff --git a/...ab44a44f9800265e49adf156b8b40b2d0f46.json → ...0f1e56a62016246c5a522423102a9e9b6dae.json b/...ab44a44f9800265e49adf156b8b40b2d0f46.json → ...0f1e56a62016246c5a522423102a9e9b6dae.json
diff --git a/...a314f61997652c070870b44d23753ad48b5c.json → ...12694e530b64a105e03a040c65b779c9d91e.json b/...a314f61997652c070870b44d23753ad48b5c.json → ...12694e530b64a105e03a040c65b779c9d91e.json
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -147,7 +147,7 @@ lettre = { version = "0.11.7", features = ["tokio1", "tokio1-native-tls"] }
 handlebars = "5.1.2"
 pin-project = "1.1.5"
 byteorder = "1.5.0"
-rayon = "1.10.0"
+rayon.workspace = true
 
 
 [dev-dependencies]
@@ -247,6 +247,7 @@ actix-web = { version = "4.5.1", default-features = false, features = [
 actix-http = { version = "3.6.0", default-features = false }
 tokio = { version = "1.36.0", features = ["sync"] }
 tokio-stream = "0.1.14"
+rayon = "1.10.0"
 futures-util = "0.3.30"
 bincode = "1.3.3"
 client-websocket = { path = "libs/client-websocket" }