Move site generation to a script

Author: jbigot

.github/actions/deploy/Dockerfile

@@ -6,32 +6,29 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    environment:
+      name: github-pages
     steps:
     - name: Checkout master
       uses: actions/checkout@v4
-      with: { fetch-depth: 0 }
-    - name: Checkout gh-pages
-      run: git worktree add -B gh-pages public remotes/origin/gh-pages
-    - name: Clean previous
-      run: |
-        find public -mindepth 1 -maxdepth 1 '!' -name .git -exec rm -rf '{}' '+'
     - name: Build site
-      uses: pdidev/pdidev.github.io/.github/actions/deploy@main
-      with:
-        output-directory: public
-        gitlab-url:  https://gitlab.maisondelasimulation.fr
-        project-name:  pdidev%2Fpdi
-    - name: Add static data
-      run: |
-        find data -mindepth 1 -maxdepth 1 -exec cp -r '{}' public ';'
-    - name: Add sitemap
-      run: |
-        ./gen_sitemap public
-    - name: Push
+      env: 
+        CI_PAGES_TOKEN: ${{secrets.CI_PAGES_TOKEN}}
       run: |
-        cd public
-        git config user.name "${GITHUB_ACTOR}"
-        git config user.email "${GITHUB_ACTOR}@noreply.example.com"
-        git add -A .
-        git commit -a -m "Update to match ${GITHUB_SHA} by ${GITHUB_EVENT_NAME} ${GITHUB_RUN_NUMBER}"
-        git push -f
+        ./generate _site https://gitlab.maisondelasimulation.fr pdidev%2Fpdi
+        find data -mindepth 1 -maxdepth 1 -exec cp -r '{}' _site ';'
+        ./gen_sitemap _site
+    - name: Upload page artifact
+      uses: actions/upload-pages-artifact@v3
+  publish:
+    needs: build
+    permissions:
+      pages: write
+      id-token: write
+    environment:
+      name: github-pages
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/actions/deploy/action.yml

@@ -8,7 +8,6 @@ then
 fi
 
 DEPLOY_DIR="${1}"
-cd "${GITHUB_WORKSPACE}"
 mkdir -p "${DEPLOY_DIR}"
 cd "${DEPLOY_DIR}"
 DEPLOY_DIR="${PWD}"
@@ -48,15 +47,15 @@ EOF
 ##	GITLAB
 ########################
 INERROR=true
-ALLTAGS="$(curl -fs "${GITLAB_URL}/api/v4/projects/${PROJECT_NAME}/repository/tags" | tr ',' '\n' | grep '"name"' | tr '"' ' ' | awk '{print $4}' | grep '^[0-9]*\.[0-9]*\.[0-9]*$' | sort -rVu)"
+ALLTAGS="$(curl -fsS "${GITLAB_URL}/api/v4/projects/${PROJECT_NAME}/repository/tags" | tr ',' '\n' | grep '"name"' | tr '"' ' ' | awk '{print $4}' | grep '^[0-9]*\.[0-9]*\.[0-9]*$' | sort -rVu)"
 for TAG_BASE in $(echo "${ALLTAGS}" | sed 's/^\([0-9]*\.[0-9]*\.\)[0-9]*$/\1/' | sort -rVu)
 do
     for TAG in $(echo "${ALLTAGS}" | fgrep "${TAG_BASE}" | sort -rVu)
     do
         cd "${WORK_DIR}"
         mkdir -p "${TAG}"
         cd "${TAG}"
-        if curl -fso artifacts.zip "${GITLAB_URL}/api/v4/projects/${PROJECT_NAME}/jobs/artifacts/${TAG}/download?job=pages"
+        if curl -fsSo artifacts.zip "${GITLAB_URL}/api/v4/projects/${PROJECT_NAME}/jobs/artifacts/${TAG}/download?job=pages"
         then
             INERROR=false
             STAG="$(echo "${TAG}" | sed 's/\.[0-9]*$//')"
@@ -97,15 +96,15 @@ fi
 ##	GITHUB
 ########################
 #INERROR=true
-#ALLTAGS="$(curl -H "Authorization: Bearer ${CI_PAGES_TOKEN}" -fs "https://api.github.com/repos/${PROJECT_NAME}/tags" | tr ',' '\n' | grep '"name"' | tr '"' ' ' | awk '{print $3}' | grep '^[0-9]*\.[0-9]*\.[0-9]*-gh$' | sort -rVu)"
+#ALLTAGS="$(curl -H "Authorization: Bearer ${CI_PAGES_TOKEN}" -fsS "https://api.github.com/repos/${PROJECT_NAME}/tags" | tr ',' '\n' | grep '"name"' | tr '"' ' ' | awk '{print $3}' | grep '^[0-9]*\.[0-9]*\.[0-9]*-gh$' | sort -rVu)"
 #for TAG_BASE in $(echo "${ALLTAGS}" | sed 's/^\([0-9]*\.[0-9]*\.\)[0-9]*-gh$/\1/' | sort -rVu)
 #do
 #    for TAG in $(echo "${ALLTAGS}" | fgrep "${TAG_BASE}" | sort -rVu)
 #    do
 #        cd "${WORK_DIR}"
 #        mkdir -p "${TAG}"
 #        cd "${TAG}"
-#        if curl -Lfso artifacts.zip "https://api.github.com/repos/${PROJECT_NAME}/zipball/refs/tags/${TAG}"
+#        if curl -LfsSo artifacts.zip "https://api.github.com/repos/${PROJECT_NAME}/zipball/refs/tags/${TAG}"
 #        then
 #            INERROR=false
 #            STAG="$(echo "${TAG}" | sed 's/\.[0-9]*$//')"
@@ -146,8 +145,8 @@ fi
 mkdir -p "${WORK_DIR}/main"
 cd "${WORK_DIR}/main"
 
-DOWNLOAD_URL=$(curl -fs -H "Authorization: Bearer ${CI_PAGES_TOKEN}" https://api.github.com/repos/pdidev/pdi/actions/artifacts | jq -r '.artifacts | .[] | select(.workflow_run.head_branch=="main") | .archive_download_url')
-curl -H "Authorization: Bearer ${CI_PAGES_TOKEN}" -Lfso artifacts.zip "${DOWNLOAD_URL}"
+DOWNLOAD_URL=$(curl -fsS -H "Authorization: Bearer ${CI_PAGES_TOKEN}" https://api.github.com/repos/pdidev/pdi/actions/artifacts | jq -r '.artifacts | .[] | map(select(.workflow_run.head_branch=="main")) | sort_by(.created_at) | last | .archive_download_url ')
+curl -H "Authorization: Bearer ${CI_PAGES_TOKEN}" -LfsSo artifacts.zip "${DOWNLOAD_URL}"
 unzip -o -d public artifacts.zip
 rm artifacts.zip
 if [ -d "public/main" ]