build: addNewTutorials.sh to GH workflow; cleanup makeGitTutorial output

AdvancedPhotonSource · Jan 16, 2025 · 61a4f84 · 61a4f84
1 parent 2b401b4
commit 61a4f84
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/builddocsite.yml b/.github/workflows/builddocsite.yml
@@ -54,15 +54,21 @@ jobs:
               pandoc --standalone ${fil} --css tutorial.css -o ${outfile}
               sed -i "s/<figure>/<BR clear=all><figure>/g" ${outfile}
             done
+            git add ${dest}
           done
         
       - name: build tutorials index 
         run: |
           cd scripts
           python makeGitTutorial.py ..
+
+      - name: Note changed files
+        run: |
+            git add tutorials.html
+            git add */data/index.html
       
-#      - name: Push changes
-#        uses: ad-m/github-push-action@master
+      - name: Push changes
+        uses: ad-m/github-push-action@master
 
       - name: Sphinx build
         run: |

diff --git a/scripts/makeGitTutorial.py b/scripts/makeGitTutorial.py
@@ -192,8 +192,7 @@ def makeDataIndex(datadir,title):
     # loop through directories in Tutorials repository
     for tutdir in glob.glob(os.path.join(TutorialsDir,'*')):
         if not os.path.isdir(tutdir): continue
-        if tutdir in ['scripts','docs','webdocs','MDtutorials']:
-            continue
         d = os.path.split(tutdir)[1]
+        if d in ['scripts','docs','webdocs','MDtutorials']: continue
         if d not in dirList: print(u"Tutorial directory not in GSASIIctrlGUI.tutorialIndex: "+d)
     print(f"\nStatistics: {tutorialcount} total tutorials, {videocount} with videos")