Merge pull request #71 from traP-jp/feat/#70-dir-struct-change

Feat/#70 dir struct change
traP-jp · Nov 7, 2024 · 471eb64 · 471eb64
2 parents d753dcc + a305362
commit 471eb64
Show file tree

Hide file tree

Showing 61 changed files with 3 additions and 109 deletions.
diff --git a/.github/workflows/_test-judge-control-app-release.yml b/.github/workflows/_test-judge-control-app-release.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./judge-control-app
+        working-directory: ./
     steps:
     - name: Checkout
       uses: actions/checkout@v4

diff --git a/.github/workflows/_test-judge-control-app.yml b/.github/workflows/_test-judge-control-app.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./judge-control-app
+        working-directory: ./
     steps:
     - name: Checkout
       uses: actions/checkout@v4

diff --git a/.github/workflows/_test-queue-app-release.yml b/.github/workflows/_test-queue-app-release.yml
diff --git a/.github/workflows/_test-queue-app.yml b/.github/workflows/_test-queue-app.yml
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -8,9 +8,6 @@ on:
 
 jobs:
 
-  test-queue-app:
-    uses: ./.github/workflows/_test-queue-app.yml
-
   test-judge-control-app:
     uses: ./.github/workflows/_test-judge-control-app.yml
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,9 +11,6 @@ on:
 
 jobs:
 
-  test-queue-app:
-    uses: ./.github/workflows/_test-queue-app-release.yml
-
   test-judge-control-app:
     uses: ./.github/workflows/_test-judge-control-app-release.yml
 
diff --git a/judge-control-app/Cargo.toml → Cargo.toml b/judge-control-app/Cargo.toml → Cargo.toml
diff --git a/...control-app/backend-api-schema/.gitignore → backend-api-schema/.gitignore b/...control-app/backend-api-schema/.gitignore → backend-api-schema/.gitignore
diff --git a/...kend-api-schema/.openapi-generator-ignore → backend-api-schema/.openapi-generator-ignore b/...kend-api-schema/.openapi-generator-ignore → backend-api-schema/.openapi-generator-ignore
diff --git a/...ckend-api-schema/.openapi-generator/FILES → backend-api-schema/.openapi-generator/FILES b/...ckend-api-schema/.openapi-generator/FILES → backend-api-schema/.openapi-generator/FILES
diff --git a/...end-api-schema/.openapi-generator/VERSION → ...end-api-schema/.openapi-generator/VERSION b/...end-api-schema/.openapi-generator/VERSION → ...end-api-schema/.openapi-generator/VERSION
diff --git a/...ontrol-app/backend-api-schema/.travis.yml → backend-api-schema/.travis.yml b/...ontrol-app/backend-api-schema/.travis.yml → backend-api-schema/.travis.yml
diff --git a/...control-app/backend-api-schema/Cargo.toml → backend-api-schema/Cargo.toml b/...control-app/backend-api-schema/Cargo.toml → backend-api-schema/Cargo.toml
diff --git a/...-control-app/backend-api-schema/README.md → backend-api-schema/README.md b/...-control-app/backend-api-schema/README.md → backend-api-schema/README.md
diff --git a/...l-app/backend-api-schema/backend-api.yaml → backend-api-schema/backend-api.yaml b/...l-app/backend-api-schema/backend-api.yaml → backend-api-schema/backend-api.yaml
diff --git a/...pp/backend-api-schema/docs/JudgeStatus.md → backend-api-schema/docs/JudgeStatus.md b/...pp/backend-api-schema/docs/JudgeStatus.md → backend-api-schema/docs/JudgeStatus.md
diff --git a/...p/backend-api-schema/docs/SubmitResult.md → backend-api-schema/docs/SubmitResult.md b/...p/backend-api-schema/docs/SubmitResult.md → backend-api-schema/docs/SubmitResult.md
diff --git a/...ackend-api-schema/docs/SubmitResultApi.md → backend-api-schema/docs/SubmitResultApi.md b/...ackend-api-schema/docs/SubmitResultApi.md → backend-api-schema/docs/SubmitResultApi.md
diff --git a/...app/backend-api-schema/docs/TestResult.md → backend-api-schema/docs/TestResult.md b/...app/backend-api-schema/docs/TestResult.md → backend-api-schema/docs/TestResult.md
diff --git a/...ontrol-app/backend-api-schema/git_push.sh → backend-api-schema/git_push.sh b/...ontrol-app/backend-api-schema/git_push.sh → backend-api-schema/git_push.sh
diff --git a/...kend-api-schema/src/apis/configuration.rs → backend-api-schema/src/apis/configuration.rs b/...kend-api-schema/src/apis/configuration.rs → backend-api-schema/src/apis/configuration.rs
diff --git a/...ol-app/backend-api-schema/src/apis/mod.rs → backend-api-schema/src/apis/mod.rs b/...ol-app/backend-api-schema/src/apis/mod.rs → backend-api-schema/src/apis/mod.rs
diff --git a/...-api-schema/src/apis/submit_result_api.rs → ...-api-schema/src/apis/submit_result_api.rs b/...-api-schema/src/apis/submit_result_api.rs → ...-api-schema/src/apis/submit_result_api.rs
diff --git a/...control-app/backend-api-schema/src/lib.rs → backend-api-schema/src/lib.rs b/...control-app/backend-api-schema/src/lib.rs → backend-api-schema/src/lib.rs
diff --git a/...end-api-schema/src/models/judge_status.rs → ...end-api-schema/src/models/judge_status.rs b/...end-api-schema/src/models/judge_status.rs → ...end-api-schema/src/models/judge_status.rs
diff --git a/...-app/backend-api-schema/src/models/mod.rs → backend-api-schema/src/models/mod.rs b/...-app/backend-api-schema/src/models/mod.rs → backend-api-schema/src/models/mod.rs
diff --git a/...nd-api-schema/src/models/submit_result.rs → ...nd-api-schema/src/models/submit_result.rs b/...nd-api-schema/src/models/submit_result.rs → ...nd-api-schema/src/models/submit_result.rs
diff --git a/...kend-api-schema/src/models/test_result.rs → backend-api-schema/src/models/test_result.rs b/...kend-api-schema/src/models/test_result.rs → backend-api-schema/src/models/test_result.rs
diff --git a/judge-control-app/generate-api-crate.sh → generate-api-crate.sh b/judge-control-app/generate-api-crate.sh → generate-api-crate.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-source ../.env.dev
+source .env.dev
 
 # Create directories if they don't exist
 if [ ! -d "judge-api-server" ]; then

diff --git a/...e-control-app/judge-api-server/.gitignore → judge-api-server/.gitignore b/...e-control-app/judge-api-server/.gitignore → judge-api-server/.gitignore
diff --git a/...udge-api-server/.openapi-generator-ignore → judge-api-server/.openapi-generator-ignore b/...udge-api-server/.openapi-generator-ignore → judge-api-server/.openapi-generator-ignore
diff --git a/...judge-api-server/.openapi-generator/FILES → judge-api-server/.openapi-generator/FILES b/...judge-api-server/.openapi-generator/FILES → judge-api-server/.openapi-generator/FILES
diff --git a/...dge-api-server/.openapi-generator/VERSION → judge-api-server/.openapi-generator/VERSION b/...dge-api-server/.openapi-generator/VERSION → judge-api-server/.openapi-generator/VERSION
diff --git a/...e-control-app/judge-api-server/Cargo.toml → judge-api-server/Cargo.toml b/...e-control-app/judge-api-server/Cargo.toml → judge-api-server/Cargo.toml
diff --git a/judge-control-app/judge-api-server/README.md → judge-api-server/README.md b/judge-control-app/judge-api-server/README.md → judge-api-server/README.md
diff --git a/...ntrol-app/judge-api-server/judge-api.yaml → judge-api-server/judge-api.yaml b/...ntrol-app/judge-api-server/judge-api.yaml → judge-api-server/judge-api.yaml
diff --git a/...ol-app/judge-api-server/src/apis/judge.rs → judge-api-server/src/apis/judge.rs b/...ol-app/judge-api-server/src/apis/judge.rs → judge-api-server/src/apis/judge.rs
diff --git a/...trol-app/judge-api-server/src/apis/mod.rs → judge-api-server/src/apis/mod.rs b/...trol-app/judge-api-server/src/apis/mod.rs → judge-api-server/src/apis/mod.rs
diff --git a/...ontrol-app/judge-api-server/src/header.rs → judge-api-server/src/header.rs b/...ontrol-app/judge-api-server/src/header.rs → judge-api-server/src/header.rs
diff --git a/...e-control-app/judge-api-server/src/lib.rs → judge-api-server/src/lib.rs b/...e-control-app/judge-api-server/src/lib.rs → judge-api-server/src/lib.rs
diff --git a/...ontrol-app/judge-api-server/src/models.rs → judge-api-server/src/models.rs b/...ontrol-app/judge-api-server/src/models.rs → judge-api-server/src/models.rs
diff --git a/...ol-app/judge-api-server/src/server/mod.rs → judge-api-server/src/server/mod.rs b/...ol-app/judge-api-server/src/server/mod.rs → judge-api-server/src/server/mod.rs
diff --git a/...control-app/judge-api-server/src/types.rs → judge-api-server/src/types.rs b/...control-app/judge-api-server/src/types.rs → judge-api-server/src/types.rs
diff --git a/queue-app/Cargo.toml b/queue-app/Cargo.toml
diff --git a/queue-app/src/main.rs b/queue-app/src/main.rs
diff --git a/judge-control-app/src/custom_file.rs → src/custom_file.rs b/judge-control-app/src/custom_file.rs → src/custom_file.rs
diff --git a/...-control-app/src/custom_file/directory.rs → src/custom_file/directory.rs b/...-control-app/src/custom_file/directory.rs → src/custom_file/directory.rs
diff --git a/...ntrol-app/src/custom_file/file_factory.rs → src/custom_file/file_factory.rs b/...ntrol-app/src/custom_file/file_factory.rs → src/custom_file/file_factory.rs
diff --git a/...-control-app/src/custom_file/text_file.rs → src/custom_file/text_file.rs b/...-control-app/src/custom_file/text_file.rs → src/custom_file/text_file.rs
diff --git a/judge-control-app/src/custom_file/traits.rs → src/custom_file/traits.rs b/judge-control-app/src/custom_file/traits.rs → src/custom_file/traits.rs
diff --git a/judge-control-app/src/main.rs → src/main.rs b/judge-control-app/src/main.rs → src/main.rs
diff --git a/judge-control-app/src/models.rs → src/models.rs b/judge-control-app/src/models.rs → src/models.rs
diff --git a/judge-control-app/src/models/judge_recipe.rs → src/models/judge_recipe.rs b/judge-control-app/src/models/judge_recipe.rs → src/models/judge_recipe.rs
diff --git a/judge-control-app/src/models/judge_result.rs → src/models/judge_result.rs b/judge-control-app/src/models/judge_result.rs → src/models/judge_result.rs
diff --git a/judge-control-app/src/remote_exec.rs → src/remote_exec.rs b/judge-control-app/src/remote_exec.rs → src/remote_exec.rs
diff --git a/judge-control-app/src/remote_exec/ssh.rs → src/remote_exec/ssh.rs b/judge-control-app/src/remote_exec/ssh.rs → src/remote_exec/ssh.rs
diff --git a/...-control-app/src/remote_exec/ssh/tests.rs → src/remote_exec/ssh/tests.rs b/...-control-app/src/remote_exec/ssh/tests.rs → src/remote_exec/ssh/tests.rs
diff --git a/judge-control-app/src/remote_exec/traits.rs → src/remote_exec/traits.rs b/judge-control-app/src/remote_exec/traits.rs → src/remote_exec/traits.rs
diff --git a/...ntrol-app/src/text_resource_repository.rs → src/text_resource_repository.rs b/...ntrol-app/src/text_resource_repository.rs → src/text_resource_repository.rs
diff --git a/...pp/src/text_resource_repository/traits.rs → src/text_resource_repository/traits.rs b/...pp/src/text_resource_repository/traits.rs → src/text_resource_repository/traits.rs
diff --git a/...e-control-app/tests/ssh_server/Dockerfile → tests/ssh_server/Dockerfile b/...e-control-app/tests/ssh_server/Dockerfile → tests/ssh_server/Dockerfile