From 40576fe675d06ab1f7619b2514596fbe4c7cca51 Mon Sep 17 00:00:00 2001 From: Zack Fu Zi Xiang Date: Fri, 8 Nov 2024 17:59:24 +0800 Subject: [PATCH 1/3] chore: add admin frontend to test matrix --- .github/workflows/integration_test.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index 9282acd9..8024cb7e 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -44,20 +44,23 @@ jobs: - name: Build Docker Images run: | export DOCKER_DEFAULT_PLATFORM=linux/amd64 - docker compose build appflowy_cloud appflowy_history appflowy_worker + docker compose build appflowy_cloud appflowy_history appflowy_worker admin_frontend - name: Push docker images to docker hub run: | docker tag appflowyinc/appflowy_cloud appflowyinc/appflowy_cloud:${GITHUB_SHA} docker tag appflowyinc/appflowy_history appflowyinc/appflowy_history:${GITHUB_SHA} docker tag appflowyinc/appflowy_worker appflowyinc/appflowy_worker:${GITHUB_SHA} + docker tag appflowyinc/admin_frontend appflowyinc/admin_frontend:${GITHUB_SHA} 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} docker push appflowyinc/appflowy_worker:${GITHUB_SHA} + docker push appflowyinc/admin_frontend:${GITHUB_SHA} APPFLOWY_HISTORY_VERSION=${GITHUB_SHA} APPFLOWY_WORKER_VERSION=${GITHUB_SHA} APPFLOWY_CLOUD_VERSION=${GITHUB_SHA} + APPFLOWY_ADMIN_FRONTEND_VERSION=${GITHUB_SHA} test: name: Integration Tests @@ -72,6 +75,8 @@ jobs: test_cmd: "-p appflowy-history" - test_service: "appflowy_worker" test_cmd: "-p appflowy-worker" + - test_service: "admin_frontend" + test_cmd: "-p admin_frontend" steps: - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@stable @@ -113,7 +118,7 @@ jobs: export APPFLOWY_ADMIN_FRONTEND_VERSION=${GITHUB_SHA} docker compose -f docker-compose-ci.yml up -d docker ps -a - + container_id=$(docker ps --filter name=appflowy-cloud-ai-1 -q) if [ -n "$container_id" ]; then echo "Displaying logs for the AppFlowy-AI container..." @@ -122,7 +127,7 @@ jobs: echo "No running container found to display logs." fi - - name: install prerequisites + - name: Install prerequisites run: | sudo apt-get update sudo apt-get install protobuf-compiler @@ -130,8 +135,7 @@ jobs: - name: Run Tests run: | echo "Running tests for ${{ matrix.test_service }} with flags: ${{ matrix.test_cmd }}" - RUST_LOG="info" DISABLE_CI_TEST_LOG="true" cargo test ${{ matrix.test_cmd }} - RUST_LOG="info" DISABLE_CI_TEST_LOG="true" cargo test -p admin_frontend ${{ matrix.test_cmd }} + RUST_LOG="info" DISABLE_CI_TEST_LOG="true" cargo test --workspace cleanup: name: Cleanup Docker Images From c436d8733ed17c19c956c0aa4eb795927c2fd7a7 Mon Sep 17 00:00:00 2001 From: Zack Fu Zi Xiang Date: Fri, 8 Nov 2024 18:10:41 +0800 Subject: [PATCH 2/3] chore: add new line to trigger ci --- src/api/workspace.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/api/workspace.rs b/src/api/workspace.rs index 6e78ffe3..d1a6a86a 100644 --- a/src/api/workspace.rs +++ b/src/api/workspace.rs @@ -1392,6 +1392,7 @@ async fn post_published_duplicate_handler( params.dest_view_id, ) .await?; + Ok(Json(AppResponse::Ok())) } From 2a102dcdbf9a6d86bbfae4ed5a33724f811f27b7 Mon Sep 17 00:00:00 2001 From: Zack Fu Zi Xiang Date: Sat, 9 Nov 2024 12:41:30 +0800 Subject: [PATCH 3/3] fix: test cmd --- .github/workflows/integration_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index 8024cb7e..53bd66bd 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -135,7 +135,7 @@ jobs: - name: Run Tests run: | echo "Running tests for ${{ matrix.test_service }} with flags: ${{ matrix.test_cmd }}" - RUST_LOG="info" DISABLE_CI_TEST_LOG="true" cargo test --workspace + RUST_LOG="info" DISABLE_CI_TEST_LOG="true" cargo test ${{ matrix.test_cmd }} cleanup: name: Cleanup Docker Images