Fix GH

Author: jbigot

generate

@@ -96,39 +96,32 @@ fi
 ########################
 ##	GITHUB
 ########################
-INERROR=true
-ALLTAGS="$(curl -H "Authorization: Bearer ${CI_PAGES_TOKEN}" -fsS "https://api.github.com/repos/${GH_PROJECT_NAME}/tags" | jq -r 'map(select(.name | test("^[0-9]+\\.[0-9]+\\.[0-9]+$"))) | sort_by(.name) | .[] | .name')"
-for TAG_BASE in $(echo "${ALLTAGS}" | sed 's/^\([0-9]*\.[0-9]*\.\)[0-9]*$/\1/' | sort -rVu)
+curl -fsS -H "Authorization: Bearer ${CI_PAGES_TOKEN}" https://api.github.com/repos/${GH_PROJECT_NAME}/actions/artifacts \
+| jq --raw-output0 '.artifacts
+    | map(select(.name == "pages" and (.workflow_run.head_branch
+    | test("^v[0-9]+\\.[0-9]+$"))))
+    | group_by(.workflow_run.head_branch)
+    | map(sort_by(.created_at))
+    | map(last)
+    | map({url:.archive_download_url,branch:.workflow_run.head_branch})
+    | .[]' \
+| while read -d $'\0' TAG_INFO
 do
-   for TAG in $(echo "${ALLTAGS}" | fgrep "${TAG_BASE}" | sort -rVu)
-   do
-       cd "${WORK_DIR}"
-       mkdir -p "${TAG}"
-       cd "${TAG}"
-       if curl -LfsSo artifacts.zip "https://api.github.com/repos/${GH_PROJECT_NAME}/zipball/refs/tags/${TAG}"
-       then
-           INERROR=false
-           STAG="$(echo "${TAG}" | sed 's/\.[0-9]*$//')"
-           unzip -o -d public artifacts.zip
-           rm artifacts.zip
-           if [ -d "public/${TAG}" ]
-           then
-               mv "public/${TAG}" "${WORK_DIR}/public/${STAG}"
-           elif [ -d "${TAG}" ]
-           then
-               mv "${TAG}" "${WORK_DIR}/public/${STAG}"
-           elif [ -d "public" ]
-           then
-               mv public "${WORK_DIR}/public/${STAG}"
-           fi
-           echo "<li><a href='${STAG}/'>version ${STAG}</a>" >> "${WORK_DIR}/public/index.html"
-           cd "${WORK_DIR}"
-           rm -rf "${WORK_DIR}/${TAG}"
-           break
-       fi
-       cd "${WORK_DIR}"
-       rm -rf "${WORK_DIR}/${TAG}"
-   done
+    DOWNLOAD_URL="$(jq -r .url <<< "$TAG_INFO")"
+    TAG="$(jq -r .branch <<< "$TAG_INFO" | sed 's/^v//')"
+    cd "${WORK_DIR}"
+    mkdir -p "${TAG}"
+    cd "${TAG}"
+    curl -H "Authorization: Bearer ${CI_PAGES_TOKEN}" -LfsSo artifacts.zip "${DOWNLOAD_URL}"
+    unzip -o -d public artifacts.zip
+    rm artifacts.zip
+    while [ 1 -eq "$(find . -mindepth 1 -maxdepth 1|wc -l)" ]
+    do
+        SUBDIR="$(find . -mindepth 1 -maxdepth 1)"
+        find "$SUBDIR" -mindepth 1 -maxdepth 1 -exec mv '{}' .
+        rmdir "$SUBDIR"
+    done
+    echo "<li><a href='${TAG}/'>version ${TAG}</a>" >> "${WORK_DIR}/public/index.html"
 done
 
 
@@ -146,7 +139,12 @@ fi
 mkdir -p "${WORK_DIR}/main"
 cd "${WORK_DIR}/main"
 
-DOWNLOAD_URL=$(curl -fsS -H "Authorization: Bearer ${CI_PAGES_TOKEN}" https://api.github.com/repos/${GH_PROJECT_NAME}/actions/artifacts | jq -r '.artifacts | map(select(.workflow_run.head_branch=="main")) | sort_by(.created_at) | last | .archive_download_url ')
+DOWNLOAD_URL=$(curl -fsS -H "Authorization: Bearer ${CI_PAGES_TOKEN}" https://api.github.com/repos/${GH_PROJECT_NAME}/actions/artifacts \
+    | jq -r '.artifacts
+        | map(select(.workflow_run.head_branch=="main" and .name == "pages"))
+        | 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