Merge pull request #302 from demarey/source

build both agendas at once

.github/workflows/makefile.yml

@@ -19,12 +19,12 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y libasound2:i386 libssl1.1:i386 libfreetype6:i386
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Generate
       run: make generate
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: ecstatic_site
         path: |
@@ -35,32 +35,20 @@ jobs:
   agenda_build:      
     uses: pillar-markup/Microdown-Agenda/.github/workflows/main.yml@main
     with:
-      agenda_filename: 2023-Conference/agenda.md
-      abstract_link: ../esug2022-abstracts.pdf
-
-  workshop_agenda_build:      
-    uses: pillar-markup/Microdown-Agenda/.github/workflows/main.yml@main
-    with:
-      agenda_filename: 2023-Conference/agenda-workshop.md
-    needs: agenda_build # avoid concurent write to the agenda artifact
+      agenda_filename: 2023-Conference/agenda.md;2023-Conference/agenda-workshop.md;2022-Conference/agenda.md;2022-Conference/agenda-workshop.md
 
   deploy:
     runs-on: ubuntu-latest
-    needs: [ecstatic_build, agenda_build, workshop_agenda_build]
+    needs: [ecstatic_build, agenda_build]
 
     steps:
     # needed by JamesIves/github-pages-deploy-action
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
-        name: ecstatic_site
         path: _site
-
-    - uses: actions/download-artifact@v3
-      with:
-        name: agenda
-        path: _site/2023-Conference/agenda
+        merge-multiple: true
 
     - name: debug
       run: ls -R