fix: revisions and release

Sometimes when the workflow gets the dependency.json it retrieves, from best I can determine, an older version of the file with outdated info. It's not failing to retrieve the file, which I initially thought was the case, it's getting the file, just not the current version of it. I've noticed this happen with more frequency lately.

You assume that this could happen when running the tests in quick succession as the file might not have propagated across their network. The problem is this is happening with release assets that have been sitting there for weeks. I file I know has a revision of 2 yet the file it reads has 1.

This must be some Github caching or system to work around action issues. In the testing for this changes my matrix would return something like all correct or 30% previous versions.

So this change is a band aid.

When github implements immutable tags i'll probably move to using revision appended tags.

Author: userdocs

.github/workflows/ci-alpine-release.yml

@@ -53,40 +53,36 @@ jobs:
           merge-multiple: true
 
       - name: Host - merge release-info ${{ inputs.distinct_id }}
+        env:
+          lt_version: ${{ matrix.qbt_libtorrent_version }}
         run: |
-          if [[ ${{ matrix.qbt_libtorrent_version }} == "1.2" ]]; then
-            for release in 1\.2/*-release.md; do
-              [[ -f "${release}" ]] && release+=("${release}")
-            done
-            revision="$(jq -r .revision 1\.2/*-dependency-version.json | head -n1)"
-            boost="$(jq -r .boost 1\.2/*-dependency-version.json | head -n1)"
-          fi
-
-          if [[ ${{ matrix.qbt_libtorrent_version }} == "2.0" ]]; then
-            for release in 2\.0/*-release.md; do
-              [[ -f "${release}" ]] && release+=("${release}")
-            done
-            revision="$(jq -r .revision 2\.0/*-dependency-version.json | head -n1)"
-            boost="$(jq -r .boost 2\.0/*-dependency-version.json | head -n1)"
-          fi
-
-          readarray -t release_sorted < <(printf '%s\n' "${release[@]}" | sort)
-
-          for dependency_version_files in 1\.2/*-dependency-version.json 2\.0/*-dependency-version.json; do
-            if [[ -f "${dependency_version_files}" ]]; then
-                sed -r 's/"boost": (.*)/BOOST_PLACEHOLDER/g' -i "${dependency_version_files}"
-                sed -r 's/"revision": (.*)/REVISION_PLACEHOLDER/g' -i "${dependency_version_files}"
-                dependency_version+=("${dependency_version_files}")
+          revision="$(jq -r .revision ${lt_version}/*-dependency-version.json | sort -nr | head -n1)"
+          boost="$(jq -r .boost ${lt_version}/*-dependency-version.json | head -n1)"
+
+          for dependency_version_json in ${lt_version}/*-dependency-version.json; do
+            if [[ -f ${dependency_version_json} ]]; then
+              sed -r 's/"boost": (.*)/BOOST_PLACEHOLDER/g' -i "${dependency_version_json}"
+              sed -r 's/"revision": (.*)/REVISION_PLACEHOLDER/g' -i "${dependency_version_json}"
+              dependency_version+=("${dependency_version_json}")
             fi
           done
 
+          for release_md in ${lt_version}/*-release.md; do
+            if [[ -f ${release_md} ]]; then
+              sed -r 's/^\|(.*)revision(.*)\|(.*)\|$/REVISION_PLACEHOLDER/g' -i "${release_md}"
+              release_md+=("${release_md}")
+            fi
+          done
+
+          readarray -t release_sorted < <(printf '%s\n' "${release_md[@]}" | sort)
           readarray -t dependency_version_sorted < <(printf '%s\n' "${dependency_version[@]}" | sort)
 
           paste -d '\n' "${release_sorted[@]}" | uniq | awk '!(NF && seen[$0]++) || /^>/' > "tmp-release.md"
           paste -d '\n' "${dependency_version_sorted[@]}" | uniq | awk '!(NF && seen[$0]++)' > "dependency-version.json"
 
           sed -i "s|BOOST_PLACEHOLDER|\"boost\": \"${boost}\",|" dependency-version.json
           sed -i "s|REVISION_PLACEHOLDER|\"revision\": \"${revision}\"|" dependency-version.json
+          sed -i "s/REVISION_PLACEHOLDER/| revision |${revision} |/" tmp-release.md
 
           ./pandoc --wrap=preserve -f gfm tmp-release.md -t gfm -o release.md
 

.pre-commit-config.yaml

@@ -26,7 +26,7 @@ repos:
       - id: check-shebang-scripts-are-executable
 
   - repo: https://github.com/woodruffw/zizmor-pre-commit
-    rev: v1.12.0
+    rev: v1.12.1
     hooks:
       - id: zizmor