-
-
Notifications
You must be signed in to change notification settings - Fork 72
[fix] Allow easily building docs with local changes again #251 #257
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
atif09
wants to merge
3
commits into
openwisp:master
Choose a base branch
from
atif09:issues/251-build-with-local-changes
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -271,6 +271,33 @@ def clone_or_update_repo(name, branch, dir_name, owner="openwisp", dest=None): | |
| If the repository already exists, update it. Otherwise, clone the repository. | ||
| """ | ||
| repository = f"{owner}/{name}" | ||
| # Support for building with local changes | ||
| if name == "openwisp-docs" and not os.environ.get("PRODUCTION"): | ||
| print(f"Using local directory for '{name}'") | ||
|
|
||
| if os.path.islink("staging-dir") or os.path.isfile("staging-dir"): | ||
| os.unlink("staging-dir") | ||
| os.makedirs("staging-dir", exist_ok=True) | ||
| exclude_items = {"staging-dir", "modules", "_build", ".git", "__pycache__"} | ||
| for item in os.listdir("."): | ||
| if item.startswith("."): | ||
| continue | ||
|
|
||
| if item in exclude_items: | ||
| continue | ||
|
|
||
| # skip virtual environments (detect with pyvenv.cfg) | ||
| if os.path.isdir(item) and os.path.exists(os.path.join(item, "pyvenv.cfg")): | ||
| continue | ||
|
|
||
| src_path = os.path.abspath(item) | ||
| dest_path = os.path.join("staging-dir", item) | ||
| if os.path.islink(dest_path): | ||
| os.unlink(dest_path) | ||
| if not os.path.exists(dest_path): | ||
| os.symlink(src_path, dest_path) | ||
| return | ||
|
|
||
| if os.environ.get("SSH"): | ||
| # SSH cloning is a convenient option for local development, as it | ||
| # allows you to commit changes directly to the repository, but it | ||
|
|
@@ -286,15 +313,28 @@ def clone_or_update_repo(name, branch, dir_name, owner="openwisp", dest=None): | |
| if os.path.exists(clone_path): | ||
| print(f"Repository '{name}' already exists. Updating...") | ||
| subprocess.run( | ||
| # Clears ambiguity when git tags and branches have identical names | ||
| ["git", "fetch", "origin", f"refs/heads/{branch}:refs/heads/{branch}"], | ||
| # Update remote-tracking ref (avoid fetching into checked-out branch) | ||
| [ | ||
| "git", | ||
| "fetch", | ||
| "origin", | ||
| f"+refs/heads/{branch}:refs/remotes/origin/{branch}", | ||
| ], | ||
| cwd=clone_path, | ||
| check=True, | ||
| ) | ||
| # "-c advice.detachedHead=false" is used to suppress the warning | ||
| # about being in a detached HEAD state when checking out tags. | ||
| subprocess.run( | ||
| ["git", "-c", "advice.detachedHead=false", "checkout", f"refs/heads/{branch}"], | ||
|
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ill double check this too |
||
| [ | ||
| "git", | ||
| "-c", | ||
| "advice.detachedHead=false", | ||
| "checkout", | ||
| "-B", | ||
| branch, | ||
| f"refs/remotes/origin/{branch}", | ||
| ], | ||
| cwd=clone_path, | ||
| check=True, | ||
| ) | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why when PRODUCTION is set the behavior is different?
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i added the PRODUCTION check thinking CI might need to clone from github but i just lookedat the CI workflow and it already checks out the specific branch before building so using local files would work fine in CI too
ill remove this check