fix: merge master

fix: root path for tests
fix: default path for tests
2025-02-27 16:11:20 +08:00 · 2025-02-27 01:28:43 -05:00 · 2025-02-27 01:26:21 -05:00 · 2025-02-27 01:25:56 -05:00 · 2025-02-27 01:17:14 -05:00 · 2025-02-27 01:14:40 -05:00
4 changed files with 12 additions and 9 deletions
--- a/README.md
+++ b/README.md
@ -16,6 +16,7 @@
 4. Install deps by `pdm install && pdm run pre-commit install`
 5. Run the cli app by `pdm run app --help`
 6. Check other commands or scripts with `pdm run --list`
+<<<<<<< HEAD

 ## How to use?

@ -37,3 +38,5 @@
 ```shell
 joj3-config-generator convert /home/tt/.config/joj
 ```
+=======
+>>>>>>> master
--- a/joj3_config_generator/convert.py
+++ b/joj3_config_generator/convert.py
@ -45,7 +45,7 @@ def convert(repo_conf: repo.Config, task_conf: task.Config) -> result.Config:
    # Construct healthcheck stage
    if (
        not repo_conf.force_skip_heatlh_check_on_test
-        or os.environ.get("PYTEST_CURRENT_TEST") is None
+        # or os.environ.get("PYTEST_CURRENT_TEST") is None
    ):
        healthcheck_stage = get_healthcheck_config(repo_conf)
        result_conf.stage.stages.append(healthcheck_stage)
--- a/tests/convert/basic/task.json
+++ b/tests/convert/basic/task.json
@ -719,7 +719,7 @@
                                    "PATH=/usr/bin:/bin:/usr/local/bin"
                                ],
                                "stdin": {
-                                    "src": "/home/tt/.config/joj/homework/h7/e2/case0.in",
+                                    "src": "case0.in",
                                    "max": 419430400
                                },
                                "cpuLimit": 1000000000,
@ -736,7 +736,7 @@
                                    "PATH=/usr/bin:/bin:/usr/local/bin"
                                ],
                                "stdin": {
-                                    "src": "/home/tt/.config/joj/homework/h7/e2/case1.in",
+                                    "src": "case1.in",
                                    "max": 419430400
                                },
                                "cpuLimit": 1000000000,
@ -762,7 +762,7 @@
                                        {
                                            "score": 5,
                                            "fileName": "stdout",
-                                            "answerPath": "/home/tt/.config/joj/homework/h7/e2/case0.out",
+                                            "answerPath": "case0.out",
                                            "forceQuitOnDiff": false,
                                            "alwaysHide": false,
                                            "compareSpace": false
@ -774,7 +774,7 @@
                                        {
                                            "score": 5,
                                            "fileName": "stdout",
-                                            "answerPath": "/home/tt/.config/joj/homework/h7/e2/case1.out",
+                                            "answerPath": "case1.out",
                                            "forceQuitOnDiff": false,
                                            "alwaysHide": false,
                                            "compareSpace": false
--- a/tests/convert/diff/task.json
+++ b/tests/convert/diff/task.json
@ -66,7 +66,7 @@
                                    "PATH=/usr/bin:/bin:/usr/local/bin"
                                ],
                                "stdin": {
-                                    "src": "/home/tt/.config/joj/homework/h7/e2/case0.in",
+                                    "src": "case0.in",
                                    "max": 419430400
                                },
                                "cpuLimit": 1000000000,
@ -83,7 +83,7 @@
                                    "PATH=/usr/bin:/bin:/usr/local/bin"
                                ],
                                "stdin": {
-                                    "src": "/home/tt/.config/joj/homework/h7/e2/case1.in",
+                                    "src": "case1.in",
                                    "max": 419430400
                                },
                                "cpuLimit": 1000000000,
@ -109,7 +109,7 @@
                                        {
                                            "score": 5,
                                            "fileName": "stdout",
-                                            "answerPath": "/home/tt/.config/joj/homework/h7/e2/case0.out",
+                                            "answerPath": "case0.out",
                                            "forceQuitOnDiff": false,
                                            "alwaysHide": false,
                                            "compareSpace": false
@ -121,7 +121,7 @@
                                        {
                                            "score": 5,
                                            "fileName": "stdout",
-                                            "answerPath": "/home/tt/.config/joj/homework/h7/e2/case1.out",
+                                            "answerPath": "case1.out",
                                            "forceQuitOnDiff": false,
                                            "alwaysHide": false,
                                            "compareSpace": false
Author	SHA1	Message	Date
李衍志523370910113	1656d622e1	fix: merge master Some checks failed build / build (pull_request) Failing after 3s Details build / build (push) Failing after 2m28s Details	2025-02-27 16:11:20 +08:00
张泊明518370910136	aee123601f	fix: root path for tests All checks were successful build / build (push) Successful in 2m23s Details	2025-02-27 01:28:43 -05:00
张泊明518370910136	ae77fa23b5	fix: default path for tests	2025-02-27 01:26:21 -05:00
张泊明518370910136	870f20dde9	chore: remove unused utils	2025-02-27 01:25:56 -05:00
张泊明518370910136	723705b94f	fix: store path for both conf objs All checks were successful build / build (push) Successful in 2m21s Details	2025-02-27 01:17:14 -05:00
张泊明518370910136	4c12bf9a34	fix: store root path Some checks failed build / build (push) Has been cancelled Details	2025-02-27 01:14:40 -05:00
张泊明518370910136	c4639aef76	fix: store relative path to root All checks were successful build / build (push) Successful in 2m46s Details	2025-02-27 00:24:43 -05:00
张泊明518370910136	ab5bfc6cfe	fix: find repo.toml recursively All checks were successful build / build (push) Successful in 2m23s Details	2025-02-25 14:05:00 -05:00
张泊明518370910136	67d2fcc4e4	feat: dump with exclude_none All checks were successful build / build (push) Successful in 2m26s Details	2025-02-25 04:15:05 -05:00
张泊明518370910136	68628c0eae	feat: convert toml files recursively All checks were successful build / build (push) Successful in 2m28s Details	2025-02-25 03:47:50 -05:00
张泊明518370910136	73f2581a31	ci: use local checkout All checks were successful build / build (push) Successful in 4m22s Details	2025-02-25 03:12:25 -05:00
张泊明518370910136	bddb67decf	test: allow non-exist toml file input All checks were successful build / build (push) Successful in 2m36s Details	2025-02-24 22:36:08 -05:00
张泊明518370910136	2bf1a225b6	docs(README): list pdm run All checks were successful build / build (push) Successful in 2m28s Details	2025-02-24 20:53:09 -05:00
张泊明518370910136	acbcda9565	ci: only use runs-on All checks were successful build / build (push) Successful in 2m31s Details	2025-02-09 13:26:19 -05:00