Skip to content

Commit c9b35c4

Browse files
kitsudaikikitsudaiki
authored
Merge branch 'develop' into dependabot/cargo/toml-0.9.10spec-1.1.0
2 parents a03c5da + be4abd7 commit c9b35c4

96 files changed

Lines changed: 2852 additions & 722 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build_test.yml‎

Lines changed: 91 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,11 @@ jobs:
231231
FORCE_COLOR: 1
232232
steps:
233233
-
234-
uses: earthly/actions-setup@b81a8e082d9fae6174210cfc6e54bd2feb124d94
235-
with:
236-
version: "latest"
234+
name: Install dependencies for SDK
235+
run: |
236+
sudo apt-get update
237+
sudo apt-get install -y protobuf-compiler gcc ssh curl pkg-config libssl-dev libsqlite3-dev
238+
sudo curl https://sh.rustup.rs -sSf | sh -s -- -y
237239
-
238240
name: Checkout repository
239241
run: |
@@ -245,22 +247,28 @@ jobs:
245247
git submodule init
246248
git submodule update --recursive
247249
-
248-
name: Compile hanami
250+
name: Compile ainari
249251
run: |
250252
cd ${GITHUB_REPOSITORY#*/}
251-
earthly --artifact +compile-ainari/tmp/ainari ./builds/
253+
cargo build
252254
-
253255
name: Copy files
254256
run: |
255-
mkdir /tmp/Ainari_debug_build_result
257+
mkdir -p /tmp/ainari_debug_build_result/ainari/
256258
cd ${GITHUB_REPOSITORY#*/}
257-
cp -r builds/ainari /tmp/Ainari_debug_build_result/
259+
cp ./target/debug/sakura /tmp/ainari_debug_build_result/ainari/
260+
cp ./target/debug/miko /tmp/ainari_debug_build_result/ainari/
261+
cp ./target/debug/ryokan /tmp/ainari_debug_build_result/ainari/
262+
cp ./target/debug/hanami /tmp/ainari_debug_build_result/ainari/
263+
cp ./target/debug/torii /tmp/ainari_debug_build_result/ainari/
264+
cp ./target/debug/omamori /tmp/ainari_debug_build_result/ainari/
265+
cp ./target/debug/onsen /tmp/ainari_debug_build_result/ainari/
258266
-
259267
name: Create artifact
260268
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b
261269
with:
262-
name: Ainari_debug_build_result
263-
path: /tmp/Ainari_debug_build_result
270+
name: ainari_debug_build_result
271+
path: /tmp/ainari_debug_build_result
264272
retention-days: 1
265273

266274

@@ -332,7 +340,7 @@ jobs:
332340
name: Compile code
333341
run: |
334342
cd ${GITHUB_REPOSITORY#*/}
335-
earthly +test-hanami
343+
earthly +test-ainari
336344
337345
338346
@@ -374,8 +382,8 @@ jobs:
374382
name: Get artifact
375383
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
376384
with:
377-
name: Ainari_debug_build_result
378-
path: /tmp/Ainari_debug_build_result
385+
name: ainari_debug_build_result
386+
path: /tmp/ainari_debug_build_result
379387
-
380388
name: Install dependencies for SDK
381389
run: |
@@ -401,25 +409,25 @@ jobs:
401409
run: |
402410
cd ${GITHUB_REPOSITORY#*/}
403411
export INTERNAL_API_KEY=test-internal-api-key && export SAKURA_REGISTRATION_KEY=sakura-key && export ONSEN_REGISTRATION_KEY=onsen-key
404-
chmod +x /tmp/Ainari_debug_build_result/ainari/hanami
405-
chmod +x /tmp/Ainari_debug_build_result/ainari/miko
406-
chmod +x /tmp/Ainari_debug_build_result/ainari/ryokan
407-
chmod +x /tmp/Ainari_debug_build_result/ainari/sakura
408-
chmod +x /tmp/Ainari_debug_build_result/ainari/torii
409-
chmod +x /tmp/Ainari_debug_build_result/ainari/omamori
410-
chmod +x /tmp/Ainari_debug_build_result/ainari/onsen
412+
chmod +x /tmp/ainari_debug_build_result/ainari/hanami
413+
chmod +x /tmp/ainari_debug_build_result/ainari/miko
414+
chmod +x /tmp/ainari_debug_build_result/ainari/ryokan
415+
chmod +x /tmp/ainari_debug_build_result/ainari/sakura
416+
chmod +x /tmp/ainari_debug_build_result/ainari/torii
417+
chmod +x /tmp/ainari_debug_build_result/ainari/omamori
418+
chmod +x /tmp/ainari_debug_build_result/ainari/onsen
411419
mkdir -p builds/binaries
412420
sudo cp -r ./example_configs/ainari /etc/ainari
413421
sudo chmod 777 -R /etc/ainari
414-
/tmp/Ainari_debug_build_result/ainari/hanami &
415-
/tmp/Ainari_debug_build_result/ainari/miko &
416-
/tmp/Ainari_debug_build_result/ainari/ryokan &
417-
/tmp/Ainari_debug_build_result/ainari/torii &
418-
/tmp/Ainari_debug_build_result/ainari/omamori &
422+
/tmp/ainari_debug_build_result/ainari/hanami &
423+
/tmp/ainari_debug_build_result/ainari/miko &
424+
/tmp/ainari_debug_build_result/ainari/ryokan &
425+
/tmp/ainari_debug_build_result/ainari/torii &
426+
/tmp/ainari_debug_build_result/ainari/omamori &
419427
# sleep to make sure, that hanami is started before sakura starts
420428
sleep 10
421-
/tmp/Ainari_debug_build_result/ainari/sakura &
422-
/tmp/Ainari_debug_build_result/ainari/onsen &
429+
/tmp/ainari_debug_build_result/ainari/sakura &
430+
/tmp/ainari_debug_build_result/ainari/onsen &
423431
# BINARY_PID=$!
424432
# trap "kill $BINARY_PID" EXIT
425433
-
@@ -464,8 +472,8 @@ jobs:
464472
name: Get artifact
465473
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
466474
with:
467-
name: Ainari_debug_build_result
468-
path: /tmp/Ainari_debug_build_result
475+
name: ainari_debug_build_result
476+
path: /tmp/ainari_debug_build_result
469477
-
470478
name: Get artifact
471479
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
@@ -494,25 +502,25 @@ jobs:
494502
run: |
495503
cd ${GITHUB_REPOSITORY#*/}
496504
export INTERNAL_API_KEY=test-internal-api-key && export SAKURA_REGISTRATION_KEY=sakura-key && export ONSEN_REGISTRATION_KEY=onsen-key
497-
chmod +x /tmp/Ainari_debug_build_result/ainari/hanami
498-
chmod +x /tmp/Ainari_debug_build_result/ainari/miko
499-
chmod +x /tmp/Ainari_debug_build_result/ainari/ryokan
500-
chmod +x /tmp/Ainari_debug_build_result/ainari/sakura
501-
chmod +x /tmp/Ainari_debug_build_result/ainari/torii
502-
chmod +x /tmp/Ainari_debug_build_result/ainari/omamori
503-
chmod +x /tmp/Ainari_debug_build_result/ainari/onsen
505+
chmod +x /tmp/ainari_debug_build_result/ainari/hanami
506+
chmod +x /tmp/ainari_debug_build_result/ainari/miko
507+
chmod +x /tmp/ainari_debug_build_result/ainari/ryokan
508+
chmod +x /tmp/ainari_debug_build_result/ainari/sakura
509+
chmod +x /tmp/ainari_debug_build_result/ainari/torii
510+
chmod +x /tmp/ainari_debug_build_result/ainari/omamori
511+
chmod +x /tmp/ainari_debug_build_result/ainari/onsen
504512
mkdir -p builds/binaries
505513
sudo cp -r ./example_configs/ainari /etc/ainari
506514
sudo chmod 777 -R /etc/ainari
507-
/tmp/Ainari_debug_build_result/ainari/hanami &
508-
/tmp/Ainari_debug_build_result/ainari/miko &
509-
/tmp/Ainari_debug_build_result/ainari/ryokan &
510-
/tmp/Ainari_debug_build_result/ainari/torii &
511-
/tmp/Ainari_debug_build_result/ainari/omamori &
515+
/tmp/ainari_debug_build_result/ainari/hanami &
516+
/tmp/ainari_debug_build_result/ainari/miko &
517+
/tmp/ainari_debug_build_result/ainari/ryokan &
518+
/tmp/ainari_debug_build_result/ainari/torii &
519+
/tmp/ainari_debug_build_result/ainari/omamori &
512520
# sleep to make sure, that hanami is started before sakura starts
513521
sleep 10
514-
/tmp/Ainari_debug_build_result/ainari/sakura &
515-
/tmp/Ainari_debug_build_result/ainari/onsen &
522+
/tmp/ainari_debug_build_result/ainari/sakura &
523+
/tmp/ainari_debug_build_result/ainari/onsen &
516524
# BINARY_PID=$!
517525
# trap "kill $BINARY_PID" EXIT
518526
-
@@ -586,8 +594,8 @@ jobs:
586594
name: Get artifact
587595
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
588596
with:
589-
name: Ainari_debug_build_result
590-
path: /tmp/Ainari_debug_build_result
597+
name: ainari_debug_build_result
598+
path: /tmp/ainari_debug_build_result
591599
-
592600
name: Install dependencies for SDK
593601
run: |
@@ -613,25 +621,25 @@ jobs:
613621
run: |
614622
cd ${GITHUB_REPOSITORY#*/}
615623
export INTERNAL_API_KEY=test-internal-api-key && export SAKURA_REGISTRATION_KEY=sakura-key && export ONSEN_REGISTRATION_KEY=onsen-key
616-
chmod +x /tmp/Ainari_debug_build_result/ainari/hanami
617-
chmod +x /tmp/Ainari_debug_build_result/ainari/miko
618-
chmod +x /tmp/Ainari_debug_build_result/ainari/ryokan
619-
chmod +x /tmp/Ainari_debug_build_result/ainari/sakura
620-
chmod +x /tmp/Ainari_debug_build_result/ainari/torii
621-
chmod +x /tmp/Ainari_debug_build_result/ainari/omamori
622-
chmod +x /tmp/Ainari_debug_build_result/ainari/onsen
624+
chmod +x /tmp/ainari_debug_build_result/ainari/hanami
625+
chmod +x /tmp/ainari_debug_build_result/ainari/miko
626+
chmod +x /tmp/ainari_debug_build_result/ainari/ryokan
627+
chmod +x /tmp/ainari_debug_build_result/ainari/sakura
628+
chmod +x /tmp/ainari_debug_build_result/ainari/torii
629+
chmod +x /tmp/ainari_debug_build_result/ainari/omamori
630+
chmod +x /tmp/ainari_debug_build_result/ainari/onsen
623631
mkdir -p builds/binaries
624632
sudo cp -r ./example_configs/ainari /etc/ainari
625633
sudo chmod 777 -R /etc/ainari
626-
/tmp/Ainari_debug_build_result/ainari/hanami &
627-
/tmp/Ainari_debug_build_result/ainari/miko &
628-
/tmp/Ainari_debug_build_result/ainari/ryokan &
629-
/tmp/Ainari_debug_build_result/ainari/torii &
630-
/tmp/Ainari_debug_build_result/ainari/omamori &
634+
/tmp/ainari_debug_build_result/ainari/hanami &
635+
/tmp/ainari_debug_build_result/ainari/miko &
636+
/tmp/ainari_debug_build_result/ainari/ryokan &
637+
/tmp/ainari_debug_build_result/ainari/torii &
638+
/tmp/ainari_debug_build_result/ainari/omamori &
631639
# sleep to make sure, that hanami is started before sakura starts
632640
sleep 10
633-
/tmp/Ainari_debug_build_result/ainari/sakura &
634-
/tmp/Ainari_debug_build_result/ainari/onsen &
641+
/tmp/ainari_debug_build_result/ainari/sakura &
642+
/tmp/ainari_debug_build_result/ainari/onsen &
635643
# BINARY_PID=$!
636644
# trap "kill $BINARY_PID" EXIT
637645
-
@@ -689,20 +697,22 @@ jobs:
689697
fail-fast: false
690698
matrix:
691699
builds:
692-
- { component: "hanami", platform: "linux/amd64", runner: "ubuntu-24.04", regitry: "kitsudaiki/hanami" }
693-
- { component: "hanami", platform: "linux/arm64", runner: "ubuntu-24.04-arm", regitry: "kitsudaiki/hanami" }
694-
- { component: "miko", platform: "linux/amd64", runner: "ubuntu-24.04", regitry: "kitsudaiki/miko" }
695-
- { component: "miko", platform: "linux/arm64", runner: "ubuntu-24.04-arm", regitry: "kitsudaiki/miko" }
696-
- { component: "ryokan", platform: "linux/amd64", runner: "ubuntu-24.04", regitry: "kitsudaiki/ryokan" }
697-
- { component: "ryokan", platform: "linux/arm64", runner: "ubuntu-24.04-arm", regitry: "kitsudaiki/ryokan" }
698-
- { component: "sakura", platform: "linux/amd64", runner: "ubuntu-24.04", regitry: "kitsudaiki/sakura" }
699-
- { component: "sakura", platform: "linux/arm64", runner: "ubuntu-24.04-arm", regitry: "kitsudaiki/sakura" }
700-
- { component: "torii", platform: "linux/amd64", runner: "ubuntu-24.04", regitry: "kitsudaiki/torii" }
701-
- { component: "torii", platform: "linux/arm64", runner: "ubuntu-24.04-arm", regitry: "kitsudaiki/torii" }
702-
- { component: "omamori", platform: "linux/amd64", runner: "ubuntu-24.04", regitry: "kitsudaiki/omamori" }
703-
- { component: "omamori", platform: "linux/arm64", runner: "ubuntu-24.04-arm", regitry: "kitsudaiki/omamori" }
704-
- { component: "onsen", platform: "linux/amd64", runner: "ubuntu-24.04", regitry: "kitsudaiki/onsen" }
705-
- { component: "onsen", platform: "linux/arm64", runner: "ubuntu-24.04-arm", regitry: "kitsudaiki/onsen" }
700+
- { component: "hanami", platform: "linux/amd64", runner: "ubuntu-24.04", regitry: "kitsudaiki/hanami" }
701+
- { component: "hanami", platform: "linux/arm64", runner: "ubuntu-24.04-arm", regitry: "kitsudaiki/hanami" }
702+
- { component: "miko", platform: "linux/amd64", runner: "ubuntu-24.04", regitry: "kitsudaiki/miko" }
703+
- { component: "miko", platform: "linux/arm64", runner: "ubuntu-24.04-arm", regitry: "kitsudaiki/miko" }
704+
- { component: "ryokan", platform: "linux/amd64", runner: "ubuntu-24.04", regitry: "kitsudaiki/ryokan" }
705+
- { component: "ryokan", platform: "linux/arm64", runner: "ubuntu-24.04-arm", regitry: "kitsudaiki/ryokan" }
706+
- { component: "sakura", platform: "linux/amd64", runner: "ubuntu-24.04", regitry: "kitsudaiki/sakura" }
707+
- { component: "sakura", platform: "linux/arm64", runner: "ubuntu-24.04-arm", regitry: "kitsudaiki/sakura" }
708+
- { component: "torii", platform: "linux/amd64", runner: "ubuntu-24.04", regitry: "kitsudaiki/torii" }
709+
- { component: "torii", platform: "linux/arm64", runner: "ubuntu-24.04-arm", regitry: "kitsudaiki/torii" }
710+
- { component: "omamori", platform: "linux/amd64", runner: "ubuntu-24.04", regitry: "kitsudaiki/omamori" }
711+
- { component: "omamori", platform: "linux/arm64", runner: "ubuntu-24.04-arm", regitry: "kitsudaiki/omamori" }
712+
- { component: "onsen", platform: "linux/amd64", runner: "ubuntu-24.04", regitry: "kitsudaiki/onsen" }
713+
- { component: "onsen", platform: "linux/arm64", runner: "ubuntu-24.04-arm", regitry: "kitsudaiki/onsen" }
714+
- { component: "dashboard", platform: "linux/amd64", runner: "ubuntu-24.04", regitry: "kitsudaiki/ainari_dashboard" }
715+
- { component: "dashboard", platform: "linux/arm64", runner: "ubuntu-24.04-arm", regitry: "kitsudaiki/ainari_dashboard" }
706716
runs-on: ${{ matrix.builds.runner }}
707717
steps:
708718
-
@@ -780,13 +790,14 @@ jobs:
780790
fail-fast: false
781791
matrix:
782792
builds:
783-
- { component: "hanami", regitry: "kitsudaiki/hanami" }
784-
- { component: "miko", regitry: "kitsudaiki/miko" }
785-
- { component: "ryokan", regitry: "kitsudaiki/ryokan" }
786-
- { component: "sakura", regitry: "kitsudaiki/sakura" }
787-
- { component: "torii", regitry: "kitsudaiki/torii" }
788-
- { component: "omamori", regitry: "kitsudaiki/omamori" }
789-
- { component: "onsen", regitry: "kitsudaiki/onsen" }
793+
- { component: "hanami", regitry: "kitsudaiki/hanami" }
794+
- { component: "miko", regitry: "kitsudaiki/miko" }
795+
- { component: "ryokan", regitry: "kitsudaiki/ryokan" }
796+
- { component: "sakura", regitry: "kitsudaiki/sakura" }
797+
- { component: "torii", regitry: "kitsudaiki/torii" }
798+
- { component: "omamori", regitry: "kitsudaiki/omamori" }
799+
- { component: "onsen", regitry: "kitsudaiki/onsen" }
800+
- { component: "dashboard", regitry: "kitsudaiki/ainari_dashboard" }
790801
steps:
791802
-
792803
name: Set branch name as environment variable
@@ -985,6 +996,7 @@ jobs:
985996
kubectl label nodes --all torii-node=true
986997
kubectl label nodes --all omamori-node=true
987998
kubectl label nodes --all onsen-node=true
999+
kubectl label nodes --all dashboard-node=true
9881000
-
9891001
name: Install hanami
9901002
run: |

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ docs_env
88
ainari_env
99
target
1010
.vite
11+
venv
12+
.venv
1113

1214
testing/go_cli_api/ainarictl
1315
testing/ansible_deploy/.vagrant/

0 commit comments

Comments
 (0)