fix: merge master
This commit is contained in:
		
						commit
						1656d622e1
					
				|  | @ -16,6 +16,7 @@ | ||||||
| 4. Install deps by `pdm install && pdm run pre-commit install` | 4. Install deps by `pdm install && pdm run pre-commit install` | ||||||
| 5. Run the cli app by `pdm run app --help` | 5. Run the cli app by `pdm run app --help` | ||||||
| 6. Check other commands or scripts with `pdm run --list` | 6. Check other commands or scripts with `pdm run --list` | ||||||
|  | <<<<<<< HEAD | ||||||
| 
 | 
 | ||||||
| ## How to use? | ## How to use? | ||||||
| 
 | 
 | ||||||
|  | @ -37,3 +38,5 @@ | ||||||
| ```shell | ```shell | ||||||
| joj3-config-generator convert /home/tt/.config/joj | joj3-config-generator convert /home/tt/.config/joj | ||||||
| ``` | ``` | ||||||
|  | ======= | ||||||
|  | >>>>>>> master | ||||||
|  |  | ||||||
|  | @ -45,7 +45,7 @@ def convert(repo_conf: repo.Config, task_conf: task.Config) -> result.Config: | ||||||
|     # Construct healthcheck stage |     # Construct healthcheck stage | ||||||
|     if ( |     if ( | ||||||
|         not repo_conf.force_skip_heatlh_check_on_test |         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) |         healthcheck_stage = get_healthcheck_config(repo_conf) | ||||||
|         result_conf.stage.stages.append(healthcheck_stage) |         result_conf.stage.stages.append(healthcheck_stage) | ||||||
|  |  | ||||||
|  | @ -719,7 +719,7 @@ | ||||||
|                                     "PATH=/usr/bin:/bin:/usr/local/bin" |                                     "PATH=/usr/bin:/bin:/usr/local/bin" | ||||||
|                                 ], |                                 ], | ||||||
|                                 "stdin": { |                                 "stdin": { | ||||||
|                                     "src": "/home/tt/.config/joj/homework/h7/e2/case0.in", |                                     "src": "case0.in", | ||||||
|                                     "max": 419430400 |                                     "max": 419430400 | ||||||
|                                 }, |                                 }, | ||||||
|                                 "cpuLimit": 1000000000, |                                 "cpuLimit": 1000000000, | ||||||
|  | @ -736,7 +736,7 @@ | ||||||
|                                     "PATH=/usr/bin:/bin:/usr/local/bin" |                                     "PATH=/usr/bin:/bin:/usr/local/bin" | ||||||
|                                 ], |                                 ], | ||||||
|                                 "stdin": { |                                 "stdin": { | ||||||
|                                     "src": "/home/tt/.config/joj/homework/h7/e2/case1.in", |                                     "src": "case1.in", | ||||||
|                                     "max": 419430400 |                                     "max": 419430400 | ||||||
|                                 }, |                                 }, | ||||||
|                                 "cpuLimit": 1000000000, |                                 "cpuLimit": 1000000000, | ||||||
|  | @ -762,7 +762,7 @@ | ||||||
|                                         { |                                         { | ||||||
|                                             "score": 5, |                                             "score": 5, | ||||||
|                                             "fileName": "stdout", |                                             "fileName": "stdout", | ||||||
|                                             "answerPath": "/home/tt/.config/joj/homework/h7/e2/case0.out", |                                             "answerPath": "case0.out", | ||||||
|                                             "forceQuitOnDiff": false, |                                             "forceQuitOnDiff": false, | ||||||
|                                             "alwaysHide": false, |                                             "alwaysHide": false, | ||||||
|                                             "compareSpace": false |                                             "compareSpace": false | ||||||
|  | @ -774,7 +774,7 @@ | ||||||
|                                         { |                                         { | ||||||
|                                             "score": 5, |                                             "score": 5, | ||||||
|                                             "fileName": "stdout", |                                             "fileName": "stdout", | ||||||
|                                             "answerPath": "/home/tt/.config/joj/homework/h7/e2/case1.out", |                                             "answerPath": "case1.out", | ||||||
|                                             "forceQuitOnDiff": false, |                                             "forceQuitOnDiff": false, | ||||||
|                                             "alwaysHide": false, |                                             "alwaysHide": false, | ||||||
|                                             "compareSpace": false |                                             "compareSpace": false | ||||||
|  |  | ||||||
|  | @ -66,7 +66,7 @@ | ||||||
|                                     "PATH=/usr/bin:/bin:/usr/local/bin" |                                     "PATH=/usr/bin:/bin:/usr/local/bin" | ||||||
|                                 ], |                                 ], | ||||||
|                                 "stdin": { |                                 "stdin": { | ||||||
|                                     "src": "/home/tt/.config/joj/homework/h7/e2/case0.in", |                                     "src": "case0.in", | ||||||
|                                     "max": 419430400 |                                     "max": 419430400 | ||||||
|                                 }, |                                 }, | ||||||
|                                 "cpuLimit": 1000000000, |                                 "cpuLimit": 1000000000, | ||||||
|  | @ -83,7 +83,7 @@ | ||||||
|                                     "PATH=/usr/bin:/bin:/usr/local/bin" |                                     "PATH=/usr/bin:/bin:/usr/local/bin" | ||||||
|                                 ], |                                 ], | ||||||
|                                 "stdin": { |                                 "stdin": { | ||||||
|                                     "src": "/home/tt/.config/joj/homework/h7/e2/case1.in", |                                     "src": "case1.in", | ||||||
|                                     "max": 419430400 |                                     "max": 419430400 | ||||||
|                                 }, |                                 }, | ||||||
|                                 "cpuLimit": 1000000000, |                                 "cpuLimit": 1000000000, | ||||||
|  | @ -109,7 +109,7 @@ | ||||||
|                                         { |                                         { | ||||||
|                                             "score": 5, |                                             "score": 5, | ||||||
|                                             "fileName": "stdout", |                                             "fileName": "stdout", | ||||||
|                                             "answerPath": "/home/tt/.config/joj/homework/h7/e2/case0.out", |                                             "answerPath": "case0.out", | ||||||
|                                             "forceQuitOnDiff": false, |                                             "forceQuitOnDiff": false, | ||||||
|                                             "alwaysHide": false, |                                             "alwaysHide": false, | ||||||
|                                             "compareSpace": false |                                             "compareSpace": false | ||||||
|  | @ -121,7 +121,7 @@ | ||||||
|                                         { |                                         { | ||||||
|                                             "score": 5, |                                             "score": 5, | ||||||
|                                             "fileName": "stdout", |                                             "fileName": "stdout", | ||||||
|                                             "answerPath": "/home/tt/.config/joj/homework/h7/e2/case1.out", |                                             "answerPath": "case1.out", | ||||||
|                                             "forceQuitOnDiff": false, |                                             "forceQuitOnDiff": false, | ||||||
|                                             "alwaysHide": false, |                                             "alwaysHide": false, | ||||||
|                                             "compareSpace": false |                                             "compareSpace": false | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user