Merge pull request 'feature/embbed-frontend' (#7 ) from feature/embbed-frontend into master

Reviewed-on: http://gitea.gwmc.dev/GW_MC/NxMesh/pulls/7
fix: update migration and entity generation commands in CI workflow
2026-04-25 14:34:55 +08:00 · 2026-04-25 06:30:13 +00:00 · 2026-04-25 06:04:55 +00:00 · 2026-04-25 04:26:59 +00:00 · 2026-04-25 03:21:36 +00:00 · 2026-04-25 02:49:47 +00:00
3 changed files with 56 additions and 11 deletions
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -50,12 +50,27 @@ jobs:
          restore-keys: |
            frontend-build-${{ runner.os }}-

-      - name: Copy frontend build to expected location
+      # TODO: uncomment until artifact hanlding fixed in gitea
+      # - name: Download frontend build artifact
+      #   uses: actions/download-artifact@v4
+      #   with:
+      #     name: frontend-dist
+      #     path: apps/nxmesh-frontend/dist
+
+      # - name: Copy frontend build to expected location
+      #   run: |
+      #     # unlink frontend-dist
+      #     rm -f apps/nxmesh-master/frontend-dist || true
+      #     rm -rf apps/nxmesh-master/frontend-dist || true
+      #     cp -r apps/nxmesh-frontend/dist apps/nxmesh-master/frontend-dist
+
+      #     ls -la apps/nxmesh-master/frontend-dist
+
+      - name: Create dummy build artifacts
        run: |
-          # unlink frontend-dist
          rm -f apps/nxmesh-master/frontend-dist || true
-          rm -rf apps/nxmesh-master/frontend-dist || true
-          cp -r apps/nxmesh-frontend/dist apps/nxmesh-master/frontend-dist
+          mkdir -p apps/nxmesh-master/frontend-dist
+          echo "<html><body><h1>Dummy Build</h1></body></html>" > apps/nxmesh-master/frontend-dist/index.html

      - name: Run tests
        run: cargo test --all-features -- --show-output
@@ -86,12 +101,25 @@ jobs:
          restore-keys: |
            frontend-build-${{ runner.os }}-

-      - name: Copy frontend build to expected location
+      # TODO: uncomment until artifact hanlding fixed in gitea
+      # - name: Download frontend build artifact
+      #   uses: actions/download-artifact@v4
+      #   with:
+      #     name: frontend-dist
+      #     path: apps/nxmesh-frontend/dist
+
+      # - name: Copy frontend build to expected location
+      #   run: |
+      #     # unlink frontend-dist
+      #     rm -f apps/nxmesh-master/frontend-dist || true
+      #     rm -rf apps/nxmesh-master/frontend-dist || true
+      #     cp -r apps/nxmesh-frontend/dist apps/nxmesh-master/frontend-dist
+
+      - name: Create dummy build artifacts
        run: |
-          # unlink frontend-dist
          rm -f apps/nxmesh-master/frontend-dist || true
-          rm -rf apps/nxmesh-master/frontend-dist || true
-          cp -r apps/nxmesh-frontend/dist apps/nxmesh-master/frontend-dist
+          mkdir -p apps/nxmesh-master/frontend-dist
+          echo "<html><body><h1>Dummy Build</h1></body></html>" > apps/nxmesh-master/frontend-dist/index.html

      - name: Run clippy
        run: cargo clippy --all-features
@@ -164,3 +192,9 @@ jobs:
          path: apps/nxmesh-frontend/dist
          key: frontend-build-${{ runner.os }}-run-${{ github.run_id }}
          # IGNORE restore-keys
+      # TODO: uncomment until artifact hanlding fixed in gitea
+      # - name: Upload frontend build artifact
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: frontend-dist
+      #     path: apps/nxmesh-frontend/dist
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -109,14 +109,14 @@ jobs:
      - name: Apply migrations
        if: steps.check_changes.outputs.changed == 'true'
        run: |
-          cargo run -p nxmesh-migration -- up
+          cd crates && sea-orm-cli migrate up

      - name: Regenerate entities
        if: steps.check_changes.outputs.changed == 'true'
        run: |
-          sea-orm-cli generate entity \
+          cd crates && sea-orm-cli generate entity \
            --database-url "$DATABASE_URL" \
-            --output-dir apps/nxmesh-master/src/db/entities \
+            --output-dir ../apps/nxmesh-master/src/db/entities \
            --with-serde both \
            --with-copy-enums \
            --date-time-crate chrono
--- a/apps/nxmesh-master/src/routes/frontend/mod.rs
+++ b/apps/nxmesh-master/src/routes/frontend/mod.rs
@@ -73,6 +73,17 @@ async fn get_file_handler(
 mod tests {
    use super::*;

+    #[tokio::test]
+    async fn test_asset() {
+        // list all embedded assets for debugging
+        let assets = FrontendAssets::iter().collect::<Vec<_>>();
+        println!("Embedded assets: {:?}", assets);
+        assert!(
+            !assets.is_empty(),
+            "Expected to find embedded assets, but found none"
+        );
+    }
+
    #[tokio::test]
    async fn test_get_index_html() {
        let index_html = get_index_html();
Author	SHA1	Message	Date
GW_MC	cd28b5009a	Merge pull request 'feature/embbed-frontend' (#7 ) from feature/embbed-frontend into master All checks were successful Test / get-ci-image (push) Successful in 6s Details Test / lint-frontend (push) Successful in 24s Details Test / frontend-build (push) Successful in 23s Details Verify / get-ci-image (push) Successful in 4s Details Test / test-frontend (push) Successful in 35s Details Test / lint-crates (push) Successful in 1m50s Details Test / test-crates (push) Successful in 2m1s Details Verify / verify-generated-db-entities (push) Successful in 2m21s Details Reviewed-on: http://gitea.gwmc.dev/GW_MC/NxMesh/pulls/7	2026-04-25 14:34:55 +08:00
GW_MC	171e505f22	fix: update migration and entity generation commands in CI workflow All checks were successful Test / get-ci-image (pull_request) Successful in 5s Details Test / lint-frontend (pull_request) Successful in 26s Details Test / frontend-build (pull_request) Successful in 24s Details Verify / get-ci-image (pull_request) Successful in 6s Details Test / test-frontend (pull_request) Successful in 33s Details Test / lint-crates (pull_request) Successful in 1m52s Details Test / test-crates (pull_request) Successful in 2m3s Details Verify / verify-generated-db-entities (pull_request) Successful in 2m25s Details	2026-04-25 06:30:13 +00:00
GW_MC	dff828addf	fix: update frontend build process to create dummy artifacts and comment out artifact handling Some checks failed Test / get-ci-image (pull_request) Successful in 6s Details Test / lint-frontend (pull_request) Successful in 21s Details Verify / get-ci-image (pull_request) Successful in 5s Details Test / frontend-build (pull_request) Successful in 26s Details Test / test-frontend (pull_request) Successful in 37s Details Test / lint-crates (pull_request) Successful in 1m45s Details Test / test-crates (pull_request) Successful in 1m57s Details Verify / verify-generated-db-entities (pull_request) Failing after 1m45s Details Co-authored-by: Copilot <copilot@github.com>	2026-04-25 06:04:55 +00:00
GW_MC	1481e31182	Revert "fix: update frontend build process and add logging for embedded assets" Some checks failed Test / get-ci-image (pull_request) Successful in 11s Details Test / lint-frontend (pull_request) Failing after 30s Details Test / test-frontend (pull_request) Successful in 21s Details Verify / get-ci-image (pull_request) Successful in 35s Details Test / frontend-build (pull_request) Successful in 51s Details Test / test-crates (pull_request) Failing after 4m37s Details Test / lint-crates (pull_request) Failing after 40s Details Verify / verify-generated-db-entities (pull_request) Successful in 9m14s Details This reverts commit `4b80619c97`.	2026-04-25 04:26:59 +00:00
GW_MC	4b80619c97	fix: update frontend build process and add logging for embedded assets Some checks failed Test / get-ci-image (pull_request) Successful in 14s Details Test / test-frontend (pull_request) Successful in 47s Details Verify / get-ci-image (pull_request) Successful in 6s Details Test / lint-frontend (pull_request) Successful in 1m14s Details Verify / verify-generated-db-entities (pull_request) Failing after 15m14s Details Test / frontend-build (pull_request) Failing after 19m51s Details Test / test-crates (pull_request) Has been skipped Details Test / lint-crates (pull_request) Has been skipped Details Co-authored-by: Copilot <copilot@github.com>	2026-04-25 03:21:36 +00:00
GW_MC	836617fa54	test: Add asset listing test for embedded frontend assets Some checks failed Test / get-ci-image (pull_request) Successful in 6s Details Test / test-frontend (pull_request) Successful in 30s Details Test / lint-frontend (pull_request) Successful in 32s Details Verify / get-ci-image (pull_request) Successful in 5s Details Verify / verify-generated-db-entities (pull_request) Successful in 3m12s Details Test / frontend-build (pull_request) Successful in 23s Details Test / lint-crates (pull_request) Failing after 4m6s Details Test / test-crates (pull_request) Failing after 4m14s Details Co-authored-by: Copilot <copilot@github.com>	2026-04-25 02:49:47 +00:00