Skip to content

Rework - #3

Merged
smatts3 merged 18 commits into
masterfrom
rework
Jun 1, 2026
Merged

Rework#3
smatts3 merged 18 commits into
masterfrom
rework

Conversation

@smatts3

@smatts3 smatts3 commented Jun 1, 2026

Copy link
Copy Markdown
Owner

No description provided.

smatts3 and others added 18 commits April 7, 2026 10:27
… already submodules. Update checks for required files and improve error handling. Modify shellcheck tests to include the new script.
… passing the Moodle root as a bare argument and clarify command usage in the help output.
…clarify the passing of the Moodle root as a bare argument. Update error messages for better user guidance. Enhance `TEAM-PROCESS.md` with detailed one-shot procedures for managing vendored monorepo plugins.
…line manifest handling. Update scripts to default to `ROOT/plugin-submodules.manifest` if no manifest is specified. Enhance README and TEAM-PROCESS.md with clarifications on manifest usage and script behavior. Improve test cases to reflect new default manifest path.
…t `--no-replay` option for one-shot conversions. Revise README and TEAM-PROCESS.md to clarify default replay behavior and usage of the new flag. Adjust test cases to ensure compatibility with the updated script functionality.
…tion. Added checks to prevent running with sh, improving script reliability and user guidance.
…rovide clearer usage instructions for executing the scripts with bash. This enhances user guidance and maintains consistency across scripts.
…int` to local `master` or `main` when omitted, improving usability. Update `README.md` and `TEAM-PROCESS.md` to reflect changes in default behavior for `--source` and `--fork-point`, clarifying the replay process and branch handling. Adjust error messages for better user guidance.
…reamlined submodule management. This option allows for automatic creation of submodules from a vendored tree and handles cases where the submodulized branch does not exist. Update usage instructions and error handling to improve user experience and prevent conflicting options. Additionally, implement a new function for applying the manifest in one-shot mode, ensuring better management of plugin submodules.
… submodule commit states. Modify the `--no-commit` option in `submodulize.sh` to ensure necessary commits for unsub replay functionality. Adjust tree reference parsing to avoid issues with CRLF mismatches in `unsubmodulize.sh`. Enhance test cases in `test-bootstrap.sh` to validate submodule structure and ensure consistent behavior across platforms.
…s.manifest` file. Update the `--manifest` option description for clarity and add functions to stage the manifest on the submodule branch. Introduce hints for switching branches with vendored plugin files, ensuring better user guidance. Update tests in `test-bootstrap.sh` to validate the presence and absence of the manifest in the appropriate branches.
…escriptions for `--source` and `--force` options for clarity, ensuring users understand the implications of incremental updates. Adjust default behavior to prioritize the `submodulized` branch when omitted, and improve error messages for better user guidance during replay operations.
…ranches during replay operations. Update the `--force` option description for clarity, emphasizing its role in rebuilding branches from a fork point. Introduce logic to apply manifest updates without requiring a full replay when the target branch exists, improving user experience and guidance.
…nc-from-unsub` to improve control over syncing between unsubmodulized and submodulized branches. Update error handling to prevent conflicting option combinations and clarify usage instructions. Introduce logic for automatic syncing when conditions are met, enhancing user experience during submodule management.
…dule, replacing `cleandev` references. Update `.gitattributes` and `.gitignore` for new paths, and enhance `build.sh` to manage GitHub token resolution for private repositories. Revise `docker-compose.yml` to utilize secrets for token handling, and update `README.md` to reflect changes in submodule management. Remove obsolete `cleandev` test scripts and workflows, introducing new tests for `submodulizer`. This restructuring improves clarity and maintainability of the project.
…ckout` in CI with `fatal: No url found for submodule path 'demo/plugin1' in .gitmodules`. The five paths (`demo/plugin1`, `demo/plugin2`, `demo/plugin3`, `demo/raw`, `demo/sub`) were committed in 7a3669c as mode-160000 gitlinks but never given matching entries in `.gitmodules` -- they were local sandbox repos created while iterating on `submodulize.sh` and have no remote URL to clone from. Drop the gitlinks from the index with `git rm --cached` and add `/demo/` to `.gitignore` so the local scratch directories on disk are preserved and no longer trip `git status` or future stagings. The real `submodulizer` submodule entry is unchanged.

Co-authored-by: Cursor <cursoragent@cursor.com>
…izer tests assume: a configured git identity and a copy of `manifest-submodulize-redundant.sh` next to `submodulize.sh`. Without `git config --global user.email/user.name`, every test that creates a temp repo and commits into it dies with `fatal: empty ident name (for <runner@...>)` -- 15 of the 17 tests in `bash submodulizer/tests/run.sh` were failing for this reason alone. The upstream tests `test-manifest-submod-redundant.sh` and `test-shellcheck.sh` additionally `assert_file "$CLEANDEV/manifest-submodulize-redundant.sh"` / `shellcheck ../manifest-submodulize-redundant.sh` against the submodulizer repo root, but this project keeps that script as project-owned glue under `submodulizer-local/`, so the file isn't where the tests look. Add a CI-only `ln -sf` step that exposes it inside `submodulizer/` (symlink lives only on the runner; nothing is committed and the submodule working tree is discarded with the job). `test-shellcheck.sh` will still fail until the SC2115/SC2015/SC1083 findings in `submodulizer/submodulize.sh` and `submodulizer/unsubmodulize.sh` are addressed upstream in smatts3/submodulizer; this commit deliberately does not touch the submodule.

Co-authored-by: Cursor <cursoragent@cursor.com>
@smatts3
smatts3 merged commit f67ee90 into master Jun 1, 2026
0 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant