refactor/main #11

Merged
李衍志523370910113 merged 23 commits from refactor/main into dev 2025-02-27 15:51:32 +08:00

what I have done

  • sync main function in master branch and tested current code usage
  • remove redundant code
  • update README documents
  • fix the immutable files logic

TODO

  • give fallback options for immutable files
# what I have done - sync main function in master branch and tested current code usage - remove redundant code - update README documents - fix the immutable files logic ## TODO - give fallback options for immutable files
李衍志523370910113 added 9 commits 2025-02-27 10:00:09 +08:00
ci: only use runs-on
All checks were successful
build / build (push) Successful in 2m31s
acbcda9565
docs(README): list pdm run
All checks were successful
build / build (push) Successful in 2m28s
2bf1a225b6
test: allow non-exist toml file input
All checks were successful
build / build (push) Successful in 2m36s
bddb67decf
ci: use local checkout
All checks were successful
build / build (push) Successful in 4m22s
73f2581a31
feat: convert toml files recursively
All checks were successful
build / build (push) Successful in 2m28s
68628c0eae
feat: dump with exclude_none
All checks were successful
build / build (push) Successful in 2m26s
67d2fcc4e4
fix: find repo.toml recursively
All checks were successful
build / build (push) Successful in 2m23s
ab5bfc6cfe
fix: conflict with master
Some checks failed
build / build (push) Failing after 2m32s
c19801f9a1
refactor(convert): remove distribute json
Some checks failed
build / build (push) Failing after 2m18s
build / build (pull_request) Failing after 2m22s
2a2387fff2
李衍志523370910113 self-assigned this 2025-02-27 10:00:18 +08:00
李衍志523370910113 added the
enhancement
label 2025-02-27 10:00:24 +08:00
李衍志523370910113 added 1 commit 2025-02-27 10:07:19 +08:00
docs: update README
Some checks failed
build / build (push) Failing after 2m27s
build / build (pull_request) Failing after 2m26s
789137d498
李衍志523370910113 added 1 commit 2025-02-27 10:11:46 +08:00
docs: update README
Some checks failed
build / build (pull_request) Failing after 2m24s
build / build (push) Failing after 2m26s
b5c43eacb3
李衍志523370910113 added 1 commit 2025-02-27 11:29:03 +08:00
chore: restructure immutable files
Some checks failed
build / build (push) Has been cancelled
build / build (pull_request) Failing after 2m32s
4adda6e716
李衍志523370910113 added 1 commit 2025-02-27 11:30:00 +08:00
fix: absolute path & immutable files feature
Some checks failed
build / build (pull_request) Failing after 2m27s
build / build (push) Failing after 2m29s
99ccbbd113
李衍志523370910113 reviewed 2025-02-27 11:34:26 +08:00
@ -85,0 +73,4 @@
)
task_obj = rtoml.loads(task_toml_path.read_text())
repo_conf = repo.Config(**repo_obj)
repo_conf.path = (root / repo_toml_path.relative_to(root)).resolve()
Author
Member

repo_conf.path as absolute

`repo_conf.path` as absolute
李衍志523370910113 reviewed 2025-02-27 11:34:27 +08:00
@ -82,3 +62,1 @@
# to be used in real action
folder_path = f"{root}"
distribute_json(folder_path, repo_obj, repo_path)
root = root.absolute()
Author
Member

@bomingzh can we consder here to make repo_conf.path to store the abosolute value?

@bomingzh can we consder here to make `repo_conf.path` to store the abosolute value?
李衍志523370910113 reviewed 2025-02-27 11:34:42 +08:00
@ -85,0 +75,4 @@
repo_conf = repo.Config(**repo_obj)
repo_conf.path = (root / repo_toml_path.relative_to(root)).resolve()
task_conf = task.Config(**task_obj)
task_conf.path = (root / task_toml_path.relative_to(root)).resolve()
Author
Member

task_conf.path as absolute

`task_conf.path` as absolute
张泊明518370910136 was assigned by 李衍志523370910113 2025-02-27 11:35:02 +08:00
李衍志523370910113 added 4 commits 2025-02-27 14:28:26 +08:00
fix: store relative path to root
All checks were successful
build / build (push) Successful in 2m46s
c4639aef76
fix: store root path
Some checks failed
build / build (push) Has been cancelled
4c12bf9a34
fix: store path for both conf objs
All checks were successful
build / build (push) Successful in 2m21s
723705b94f
fix: merge master
Some checks failed
build / build (push) Failing after 2m28s
build / build (pull_request) Failing after 2m29s
1a1ed96c23
李衍志523370910113 added 4 commits 2025-02-27 14:37:43 +08:00
fix: root path for tests
All checks were successful
build / build (push) Successful in 2m23s
aee123601f
fix: merge master
Some checks failed
build / build (pull_request) Failing after 2m34s
build / build (push) Failing after 2m32s
adfdc027f2
李衍志523370910113 added 1 commit 2025-02-27 15:31:11 +08:00
fix: pass pytest
All checks were successful
build / build (push) Successful in 2m29s
build / build (pull_request) Successful in 2m27s
1f0ee639dd
Author
Member

@bomingzh Hi boming, this pr pass test, can you plz review it and give approvement? :)

@bomingzh Hi boming, this pr pass test, can you plz review it and give approvement? :)
李衍志523370910113 added 1 commit 2025-02-27 15:45:29 +08:00
fix(diff): get cases path
All checks were successful
build / build (pull_request) Successful in 2m32s
build / build (push) Successful in 2m35s
05207037f5
李衍志523370910113 changed title from WIP: refactor/main to refactor/main 2025-02-27 15:51:20 +08:00
李衍志523370910113 merged commit 347c4b91d5 into dev 2025-02-27 15:51:32 +08:00
Sign in to join this conversation.
No reviewers
No Milestone
No project
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: JOJ/JOJ3-config-generator#11
No description provided.