Add guards if Hugo submodule version doesn't match

Author: agriyakhetarpal

.github/update-hugo.md

@@ -12,6 +12,7 @@ https://github.com/gohugoio/hugo/releases/tag/v${LATEST_VERSION}
 
 ### Release checklist
 
+- [ ] Confirm the `hugo-src` submodule is at the correct tag (`git submodule status` should show `v${LATEST_VERSION}`)
 - [ ] Check the release notes for any interesting changes, and if the Go version has been updated (if so, update the Go version in `ci.yml`, `cd.yml`, and `docs/go.mod` manually)
 - [ ] Merge this PR
 - [ ] Run `nox -s tag -- v${LATEST_VERSION}` locally to create a signed tag

.github/workflows/cd.yml

@@ -399,8 +399,12 @@ jobs:
           VERSION="${TAG#v}"
 
           # Select template based on whether this is a patch release
+          # A fourth version component would mean that it's a patch
+          # release for hugo-python-distributions to fix a problem
+          # with a stable/patch release of Hugo
           PATCH=$(echo "$VERSION" | cut -d. -f3)
-          if [ "$PATCH" -gt 0 ]; then
+          PKG_PATCH=$(echo "$VERSION" | cut -d. -f4)
+          if [ "$PATCH" -gt 0 ] || [ -n "$PKG_PATCH" ]; then
             TEMPLATE="release_notes/patch.md"
           else
             TEMPLATE="release_notes/stable.md"

.github/workflows/update-hugo.yml

@@ -68,6 +68,14 @@ jobs:
           git checkout "v$LATEST_VERSION"
           cd ..
 
+          # Verify the submodule HEAD is exactly at the expected tag
+          SUBMODULE_TAG=$(git -C hugo-src describe --tags --exact-match HEAD)
+          if [ "$SUBMODULE_TAG" != "v$LATEST_VERSION" ]; then
+            echo "ERROR: submodule tag '$SUBMODULE_TAG' does not match 'v$LATEST_VERSION'"
+            exit 1
+          fi
+          echo "Submodule verified at $SUBMODULE_TAG"
+
           echo "updated=true" >> "$GITHUB_OUTPUT"
           echo "latest_version=$LATEST_VERSION" >> "$GITHUB_OUTPUT"
           echo "current_version=$CURRENT_VERSION" >> "$GITHUB_OUTPUT"

hugo-src

@@ -1,6 +1,6 @@
 project(
   'hugo-python-distributions',
-  version : '0.162.0',
+  version : '0.162.0.1',
   meson_version : '>=1.3.0',
   default_options : ['warning_level=0'],
 )
@@ -15,6 +15,33 @@ py = import('python').find_installation(pure: true)
 go  = find_program('go',  required: true)
 git = find_program('git', required: true)
 
+# Verify the hugo-src submodule tag matches the declared version at configure time
+fs = import('fs')
+_hugo_src = meson.project_source_root() / 'hugo-src'
+_hugo_tag = ''
+if fs.is_file(_hugo_src / '.git') or fs.is_dir(_hugo_src / '.git')
+  _r = run_command(
+    git, '-C', _hugo_src, 'describe', '--tags', '--exact-match', 'HEAD',
+    check: false,
+    capture: true,
+  )
+  if _r.returncode() == 0
+    _hugo_tag = _r.stdout().strip()
+  endif
+endif
+if _hugo_tag != ''
+  # We need some special handling so that we can have a different X.Y.Z.W version scheme for
+  # the Python package than the Hugo versioning scheme of X.Y.Z. The submodule is expected to
+  # be tagged with 'vX.Y.Z' matching the first three components of the meson.build version.
+  version = meson.project_version().split('.')
+  _expected_hugo_tag = 'v' + version[0] + '.' + version[1] + '.' + version[2]
+  if _hugo_tag != _expected_hugo_tag
+    error(
+      'the hugo-src submodule is at \'' + _hugo_tag + '\' but meson.build declares v' + meson.project_version()
+    )
+  endif
+endif
+
 configure_file(
   input : 'src/hugo/_version.py.in',
   output : '_version.py',