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

* Remove unnecessary defines * run delete_sub_repos (cherry picked from commit c188f27) Co-authored-by: Christoph Fröhlich <[email protected]>
ros-controls · Apr 21, 2024 · 3540041 · 3540041
1 parent acc513d
commit 3540041
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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 "<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

diff --git 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("<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"}