Compare commits

7 Commits

Author SHA1 Message Date
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
Test / lint-frontend (push) Successful in 24s
Test / frontend-build (push) Successful in 23s
Verify / get-ci-image (push) Successful in 4s
Test / test-frontend (push) Successful in 35s
Test / lint-crates (push) Successful in 1m50s
Test / test-crates (push) Successful in 2m1s
Verify / verify-generated-db-entities (push) Successful in 2m21s
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
Test / lint-frontend (pull_request) Successful in 26s
Test / frontend-build (pull_request) Successful in 24s
Verify / get-ci-image (pull_request) Successful in 6s
Test / test-frontend (pull_request) Successful in 33s
Test / lint-crates (pull_request) Successful in 1m52s
Test / test-crates (pull_request) Successful in 2m3s
Verify / verify-generated-db-entities (pull_request) Successful in 2m25s
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
Test / lint-frontend (pull_request) Successful in 21s
Verify / get-ci-image (pull_request) Successful in 5s
Test / frontend-build (pull_request) Successful in 26s
Test / test-frontend (pull_request) Successful in 37s
Test / lint-crates (pull_request) Successful in 1m45s
Test / test-crates (pull_request) Successful in 1m57s
Verify / verify-generated-db-entities (pull_request) Failing after 1m45s
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
Test / lint-frontend (pull_request) Failing after 30s
Test / test-frontend (pull_request) Successful in 21s
Verify / get-ci-image (pull_request) Successful in 35s
Test / frontend-build (pull_request) Successful in 51s
Test / test-crates (pull_request) Failing after 4m37s
Test / lint-crates (pull_request) Failing after 40s
Verify / verify-generated-db-entities (pull_request) Successful in 9m14s
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
Test / test-frontend (pull_request) Successful in 47s
Verify / get-ci-image (pull_request) Successful in 6s
Test / lint-frontend (pull_request) Successful in 1m14s
Verify / verify-generated-db-entities (pull_request) Failing after 15m14s
Test / frontend-build (pull_request) Failing after 19m51s
Test / test-crates (pull_request) Has been skipped
Test / lint-crates (pull_request) Has been skipped
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
Test / test-frontend (pull_request) Successful in 30s
Test / lint-frontend (pull_request) Successful in 32s
Verify / get-ci-image (pull_request) Successful in 5s
Verify / verify-generated-db-entities (pull_request) Successful in 3m12s
Test / frontend-build (pull_request) Successful in 23s
Test / lint-crates (pull_request) Failing after 4m6s
Test / test-crates (pull_request) Failing after 4m14s
Co-authored-by: Copilot <copilot@github.com>
2026-04-25 02:49:47 +00:00
GW_MC
e74ddb96ab fix: embed frontend builds in test
Some checks failed
Test / get-ci-image (pull_request) Successful in 5s
Test / lint-frontend (pull_request) Successful in 24s
Test / frontend-build (pull_request) Successful in 23s
Verify / get-ci-image (pull_request) Successful in 5s
Test / test-frontend (pull_request) Successful in 38s
Test / lint-crates (pull_request) Successful in 2m34s
Test / test-crates (pull_request) Failing after 2m44s
Verify / verify-generated-db-entities (pull_request) Successful in 3m2s
2026-04-25 02:41:16 +00:00
3 changed files with 61 additions and 8 deletions

View File

@@ -50,11 +50,30 @@ jobs:
restore-keys: | restore-keys: |
frontend-build-${{ runner.os }}- frontend-build-${{ runner.os }}-
- name: create symlink to frontend build # TODO: uncomment until artifact hanlding fixed in gitea
run: ln -s ${{ github.workspace }}/apps/nxmesh-frontend/dist ${{ github.workspace }}/apps/nxmesh-master/frontend-dist # - 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: |
rm -f apps/nxmesh-master/frontend-dist || true
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 - name: Run tests
run: cargo test --all-features run: cargo test --all-features -- --show-output
lint-crates: lint-crates:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -82,8 +101,25 @@ jobs:
restore-keys: | restore-keys: |
frontend-build-${{ runner.os }}- frontend-build-${{ runner.os }}-
- name: create symlink to frontend build # TODO: uncomment until artifact hanlding fixed in gitea
run: ln -s ${{ github.workspace }}/apps/nxmesh-frontend/dist ${{ github.workspace }}/apps/nxmesh-master/frontend-dist # - 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: |
rm -f apps/nxmesh-master/frontend-dist || true
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 - name: Run clippy
run: cargo clippy --all-features run: cargo clippy --all-features
@@ -156,3 +192,9 @@ jobs:
path: apps/nxmesh-frontend/dist path: apps/nxmesh-frontend/dist
key: frontend-build-${{ runner.os }}-run-${{ github.run_id }} key: frontend-build-${{ runner.os }}-run-${{ github.run_id }}
# IGNORE restore-keys # 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

View File

@@ -109,14 +109,14 @@ jobs:
- name: Apply migrations - name: Apply migrations
if: steps.check_changes.outputs.changed == 'true' if: steps.check_changes.outputs.changed == 'true'
run: | run: |
cargo run -p nxmesh-migration -- up cd crates && sea-orm-cli migrate up
- name: Regenerate entities - name: Regenerate entities
if: steps.check_changes.outputs.changed == 'true' if: steps.check_changes.outputs.changed == 'true'
run: | run: |
sea-orm-cli generate entity \ cd crates && sea-orm-cli generate entity \
--database-url "$DATABASE_URL" \ --database-url "$DATABASE_URL" \
--output-dir apps/nxmesh-master/src/db/entities \ --output-dir ../apps/nxmesh-master/src/db/entities \
--with-serde both \ --with-serde both \
--with-copy-enums \ --with-copy-enums \
--date-time-crate chrono --date-time-crate chrono

View File

@@ -73,6 +73,17 @@ async fn get_file_handler(
mod tests { mod tests {
use super::*; 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] #[tokio::test]
async fn test_get_index_html() { async fn test_get_index_html() {
let index_html = get_index_html(); let index_html = get_index_html();