Skip to content
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.

Sign up for GitHub

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

Cleanup deploy_defines and harden multiversion make target (backport #286) #288

Merged
merged 1 commit into from
Apr 21, 2024
Merged

Cleanup deploy_defines and harden multiversion make target (backport #286) #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,11 @@ multiversion-with-api: Makefile
sphinx-multiversion $(SPHINXOPTS) $(SOURCEDIR) $(BUILDDIR)/html
@echo Step 3: Deleting temporary commits
./make_help_scripts/delete_tmp_commits.py
@echo Step 4: Building multiverison API
@echo Step 4: Cleanup subrepos, just to be sure
./make_help_scripts/delete_sub_repos.py
@echo Step 5: Building multiversion API
./make_help_scripts/create_api_multi_version.py
@echo Step 5: Create correct index
@echo Step 6: Create correct index
@echo "<html><head><meta http-equiv=\"refresh\" content=\"0; url=master/index.html\" /></head></html>" > "$(BUILDDIR)"/html/index.html

.PHONY: help Makefile html-with-errors html-with-api multiversion multiversion-with-api multiversion-with-errors html-all-subrepos html-all-subrepos-with-api html-all-subrepos-with-errors linkcheck-all-subrepos-with-api
Expand Down
4 changes: 0 additions & 4 deletions make_help_scripts/deploy_defines.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,6 @@ def add_pr_stats_file():
with open(os.path.join(pr_stats_target_folder, pr_stats_filename), 'w') as f:
f.write("<i>No pr statistics available yet.</i>")

# definition single html
# the branch from which the api is checked out and built
api_branch = "master"

# definitions for multiversion
# branches on which the temporary commits are created
# {"branch checked out for multiversion": "branch checked out for all subrepos with maps below"}
Expand Down
Loading