try fix invalid working dir

root-project · Apr 26, 2024 · e1709c2 · e1709c2
1 parent eb48bec
commit e1709c2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/root-docs.yml b/.github/workflows/root-docs.yml
@@ -78,7 +78,7 @@ jobs:
       contents: read
 
     container:
-      image: registry.cern.ch/root-ci/alma9:buildready # ALSO UPDATE BELOW!
+      image: registry.cern.ch/root-ci/ ${{ env.PLATFORM }}:buildready # ALSO UPDATE BELOW!
       options: '--security-opt label=disable --rm' # ALSO UPDATE BELOW!
       env:
         OS_APPLICATION_CREDENTIAL_ID: '7f5b64a265244623a3a933308569bdba'
@@ -203,7 +203,7 @@ jobs:
 
     # The output DOCU_LOCATION set in documentation/doxygen/CMakeLists.txt
     - name: Create documentation archives
-      working-directory: ${DOC_LOCATION}
+      working-directory: ${{ env.DOC_LOCATION }}
       shell: bash
       run: |
         tarnamegz=${DOC_DIR}.tar.gz

diff --git a/documentation/doxygen/Makefile b/documentation/doxygen/Makefile
@@ -33,7 +33,7 @@ define MkDir
 	+@[ -d $1 ] || mkdir -p $1
 endef
 
-all: filter folders mathjax js images doxygen replaceCollaborationDiagrams notebooks rootWork
+all: filter folders mathjax js images doxygen replaceCollaborationDiagrams
 
 filter:
 	`root-config --cxx` -o filter filter.cxx -std=c++14 -O2
@@ -63,7 +63,6 @@ doxygen: filter pyzdoc
 	./makehtmlfooter.sh > htmlfooter.html
 	./makeinput.sh
 	doxygen
-	bash ./CleanNamespaces.sh
 	rm -rf files c1* *.ps *.eps *.png *.jpg *.tex *.svg *.pdf *.root *.xpm *.out *.dat *.dtd *.dot *.txt *.csv *.log *.rs
 	rm -rf listofclass.sh tmva* data* result* config* test* Roo* My* Freq*
 	rm -f Doxyfile_INPUT filter htmlfooter.html MDF.C pca.C

diff --git a/documentation/doxygen/makeinput.sh b/documentation/doxygen/makeinput.sh
@@ -67,7 +67,7 @@ echo "        ../../core/zip/inc/Compression.h \\" >> Doxyfile_INPUT
 # echo "        ../../roofit/                    \\" >> Doxyfile_INPUT
 # echo "        ../../tree/                      \\" >> Doxyfile_INPUT
 # echo "        ../../sql/                       \\" >> Doxyfile_INPUT
-echo "        ../../tutorials/                 \\" >> Doxyfile_INPUT
+# echo "        ../../tutorials/                 \\" >> Doxyfile_INPUT
 # echo "        ../../bindings/tpython/          \\" >> Doxyfile_INPUT
 # echo "        ../../bindings/pyroot/           \\" >> Doxyfile_INPUT
 # echo "        ../../bindings/r/                \\" >> Doxyfile_INPUT