From 35400417204c7b062a892587d7d44e1fdb86be3d Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Sun, 21 Apr 2024 14:46:15 +0200 Subject: [PATCH] Cleanup deploy_defines and harden multiversion make target (#286) (#288) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Remove unnecessary defines * run delete_sub_repos (cherry picked from commit c188f27b547d0d32b6a2720e6415ecdb7297328a) Co-authored-by: Christoph Fröhlich --- Makefile | 6 ++++-- make_help_scripts/deploy_defines.py | 4 ---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 2b01e42bcb4..702f71eda23 100644 --- a/Makefile +++ b/Makefile @@ -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 "" > "$(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 diff --git a/make_help_scripts/deploy_defines.py b/make_help_scripts/deploy_defines.py index b68b0aee53e..b4139d0842a 100644 --- a/make_help_scripts/deploy_defines.py +++ b/make_help_scripts/deploy_defines.py @@ -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("No pr statistics available yet.") -# 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"}