WIP: mass rebuild release counters

.azldev-version

@@ -1 +1 @@
-261ae7471a4421377d557c51aaae70add8bc9caf
+30ea37909d0f4196ec765b567f1c9d17e321dcb5

.github/workflows/ado/templates/steps/get-changes-info.yml

@@ -73,4 +73,6 @@ steps:
 
   - template: verify-rendered-specs.yml
     parameters:
+      fromCommitVar: ${{ parameters.baseCommitVar }}
       renderSetFileVar: ${{ parameters.renderSetFileVar }}
+      toCommitVar: ${{ parameters.sourceCommitVar }}

.github/workflows/ado/templates/steps/verify-rendered-specs.yml

@@ -4,12 +4,19 @@
 # Step template: render the components in the render set (--check-only) and fail
 # if any component's rendered output would change, catching stale renders and
 # direct hand-edits. Reads the render-set path from the variable named by
-# renderSetFileVar.
+# renderSetFileVar, and the (from, to) commit range for the SRPM EVR check from
+# the variables named by fromCommitVar / toCommitVar.
 
 parameters:
+  - name: fromCommitVar
+    type: string
+    default: baseCommit
   - name: renderSetFileVar
     type: string
     default: renderSetFile
+  - name: toCommitVar
+    type: string
+    default: sourceCommit
 
 steps:
   - script: |
@@ -23,22 +30,34 @@ steps:
       # An empty render set just means no components changed.
       if [[ ! -s "$RENDER_SET_FILE" ]]; then
         echo "No changed components -- skipping render."
-        exit 0
+      else
+        echo "##[group]Render set"
+        sed 's/^/  - /' "$RENDER_SET_FILE"
+        echo "##[endgroup]"
+        echo "##[group]Specs rendering + verification"
+        # `-x` fails loudly if the arg list would split into multiple xargs
+        # invocations -- a multi-batch render-check would silently mask drift in
+        # the later batches. `-n 50000` is required for `-x` to have any effect
+        # (without `-n`/`-L`, GNU xargs never splits). `--` ends azldev option
+        # parsing so component names beginning with `-` (none today) are
+        # unambiguous. `env AZLDEV_ALLOW_ROOT=1` is inline per
+        # .github/instructions/ado-pipeline.instructions.md.
+        xargs -x -n 50000 -d '\n' env AZLDEV_ALLOW_ROOT=1 azldev component render --check-only -- \
+          < "$RENDER_SET_FILE"
+        echo "##[endgroup]"
       fi
-      echo "##[group]Render set"
-      sed 's/^/  - /' "$RENDER_SET_FILE"
-      echo "##[endgroup]"
-      echo "##[group]Specs rendering + verification"
-      # `-x` fails loudly if the arg list would split into multiple xargs
-      # invocations -- a multi-batch render-check would silently mask drift in
-      # the later batches. `-n 50000` is required for `-x` to have any effect
-      # (without `-n`/`-L`, GNU xargs never splits). `--` ends azldev option
-      # parsing so component names beginning with `-` (none today) are
-      # unambiguous. `env AZLDEV_ALLOW_ROOT=1` is inline per
-      # .github/instructions/ado-pipeline.instructions.md.
-      xargs -x -n 50000 -d '\n' env AZLDEV_ALLOW_ROOT=1 azldev component render --check-only -- \
-        < "$RENDER_SET_FILE"
+
+      echo "##[group]SRPM EVR verification"
+      # Unlike GitHub's render workflow, this check-only render leaves the
+      # working tree untouched, so this gate validates committed specs. It
+      # always proves a release-only rebuild of every counter-bumped component
+      # would produce a new EVR, and `--from`/`--to` add the cross-ref
+      # regression check over the same commit range the change set used.
+      env AZLDEV_ALLOW_ROOT=1 azldev component check --evr \
+        --from "$FROM_COMMIT" --to "$TO_COMMIT" -a -q -O json
       echo "##[endgroup]"
     env:
+      FROM_COMMIT: $(${{ parameters.fromCommitVar }})
       RENDER_SET_FILE: $(${{ parameters.renderSetFileVar }})
+      TO_COMMIT: $(${{ parameters.toCommitVar }})
     displayName: "Verify rendered specs are up to date"

.github/workflows/check-rendered-specs.yml

@@ -508,10 +508,29 @@ jobs:
               # check_rendered_specs.py diffs the working tree (now containing
               # any re-render output and any orphan-cleanup deletions) against
               # HEAD and produces the user-facing patch.
+              # Run both gates before exiting so counter drift cannot prevent
+              # the report and fix patch needed by the PR comment job.
+              render_check_exit=0
               python3 /scripts-render/check_rendered_specs.py \
                 --specs-dir "$SPECS_DIR" \
                 --report /output/render-check-report.json \
-                --patch /output/rendered-specs.patch
+                --patch /output/rendered-specs.patch || render_check_exit=$?
+
+              # Counter configuration targets rendered text, so run this after
+              # the PR render and retain its machine-readable result with the
+              # existing drift artifacts. `--from "$PR_BASE_SHA"` is the same
+              # baseline the render set was computed from (and was fetched
+              # explicitly above), so the EVR regression half compares exactly
+              # the range this PR introduces.
+              counter_check_exit=0
+              azldev component check --evr --from "$PR_BASE_SHA" -a -q -O json \
+                > /output/release-counter-check.json || counter_check_exit=$?
+
+              if [ "$render_check_exit" -ne 0 ]; then
+                exit "$render_check_exit"
+              fi
+
+              exit "$counter_check_exit"
             '
 
       # Dual upload: `archive: false` (v7 feature) gives browser users a direct
@@ -543,6 +562,7 @@ jobs:
           path: |
             render-output/render-output.json
             render-output/render-check-report.json
+            render-output/release-counter-check.json
 
   # Post the PR comment. Runs in a separate job so the `pull-requests: write`
   # token is only granted to a job that does NOT execute any PR-derived code:

base/comps/SLOF/SLOF.comp.toml

@@ -1,3 +1,3 @@
 [components.SLOF]
-# Release: 8.git%{gittagcommit}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 8.git%{gittagcommit}%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^([0-9]+)\.git%\{gittagcommit\}(?:%\{\??dist\})?$' } }

base/comps/aalib/aalib.comp.toml

@@ -1,3 +1,3 @@
 [components.aalib]
-# Release: 0.56.%{rc_subver}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 0.56.%{rc_subver}%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^0\.([0-9]+)\.%\{rc_subver\}(?:%\{\??dist\})?$' } }

base/comps/alsa-lib/alsa-lib.comp.toml

@@ -1,3 +1,3 @@
 [components.alsa-lib]
-# Release: 1%{?prever_dot}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 1%{?prever_dot}%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^([0-9]+)%\{\?prever_dot\}(?:%\{\??dist\})?$' } }

base/comps/ansible-packaging/ansible-packaging.comp.toml

@@ -1,3 +1,9 @@
 [components.ansible-packaging]
-# Release: 18.1%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 18.1%{?dist}
+
+[components.ansible-packaging.release]
+calculation = "static"
+
+[components.ansible-packaging.release.counter]
+source = "release-tag"
+regex = '^[0-9]+\.([0-9]+)(?:%\{\??dist\})?$'

base/comps/ant-contrib/ant-contrib.comp.toml

@@ -1,3 +1,3 @@
 [components.ant-contrib]
-# Release: 0.49.%{beta_number}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 0.49.%{beta_number}%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^0\.([0-9]+)\.%\{beta_number\}(?:%\{\??dist\})?$' } }

base/comps/antlr3/antlr3.comp.toml

@@ -1,3 +1,3 @@
 [components.antlr3]
-# Release: %{baserelease}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: %{baserelease}%{?dist}
+release = { calculation = "static", counter = { source = "spec-macro", directive = "global", name = "baserelease" } }

base/comps/arpack/arpack.comp.toml

@@ -1,3 +1,3 @@
 [components.arpack]
-# Release: 7%{dist}
-release = { calculation = "manual" }
+# Upstream Release: 7%{dist}
+release = { calculation = "static" }

base/comps/augeas/augeas.comp.toml

@@ -1,3 +1,3 @@
 [components.augeas]
-# Release: 0.6%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 0.6%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^0\.([0-9]+)(?:%\{\??dist\})?$' } }

base/comps/automoc/automoc.comp.toml

@@ -1,3 +1,3 @@
 [components.automoc]
-# Release: 0.51.%{?beta_tag}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 0.51.%{?beta_tag}%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^0\.([0-9]+)\.%\{\?beta_tag\}(?:%\{\??dist\})?$' } }

base/comps/azurelinux-release/azurelinux-release.comp.toml

@@ -1,3 +1,4 @@
 [components.azurelinux-release]
 spec = { type = "local", path = "azurelinux-release.spec" }
-release = { calculation = "manual" }
+# Upstream Release: 21%{?dist}
+release = { calculation = "static" }

base/comps/ca-certificates/ca-certificates.comp.toml

@@ -1,3 +1,3 @@
 [components.ca-certificates]
-# Release: 1.1%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 1.1%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^1\.([0-9]+)(?:%\{\??dist\})?$' } }

base/comps/cachefilesd/cachefilesd.comp.toml

@@ -1,3 +1,3 @@
 [components.cachefilesd]
-# Release: 21%{?dist}%{?buildid}
-release = { calculation = "manual" }
+# Upstream Release: 21%{?dist}%{?buildid}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^([0-9]+)(?:%\{\??dist\})?%\{\?buildid\}$' } }

base/comps/chkrootkit/chkrootkit.comp.toml

@@ -1,3 +1,3 @@
 [components.chkrootkit]
-# Release: 1b%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 1b%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^([0-9]+)b(?:%\{\??dist\})?$' } }

base/comps/civetweb/civetweb.comp.toml

@@ -1,3 +1,3 @@
 [components.civetweb]
-# Release: 10%{?dev:%{dev}}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 10%{?dev:%{dev}}%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^([0-9]+)%\{\?dev:%\{dev\}\}(?:%\{\??dist\})?$' } }

base/comps/cmake/cmake.comp.toml

@@ -1,3 +1,3 @@
 [components.cmake]
-# Release: %{baserelease}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: %{baserelease}%{?dist}
+release = { calculation = "static", counter = { source = "spec-macro", directive = "global", name = "baserelease" } }

base/comps/cpuinfo/cpuinfo.comp.toml

@@ -1,3 +1,3 @@
 [components.cpuinfo]
-# Release: %{patch_level}.git%{?shortcommit0}%{?dist}.2
-release = { calculation = "manual" }
+# Upstream Release: %{patch_level}.git%{?shortcommit0}%{?dist}.2
+release = { calculation = "static", counter = { source = "release-tag", regex = '^%\{patch_level\}\.git%\{\?shortcommit0\}(?:%\{\??dist\})?\.([0-9]+)$' } }

base/comps/cross-gcc/cross-gcc.comp.toml

@@ -1,3 +1,3 @@
 [components.cross-gcc]
-# Release: %{cross_gcc_release}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: %{cross_gcc_release}%{?dist}
+release = { calculation = "static", counter = { source = "spec-macro", directive = "global", name = "cross_gcc_release" } }

base/comps/crypto-policies/crypto-policies.comp.toml

@@ -1,3 +1,3 @@
 [components.crypto-policies]
-# Release: 1.git%{git_commit_hash}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 1.git%{git_commit_hash}%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^([0-9]+)\.git%\{git_commit_hash\}(?:%\{\??dist\})?$' } }

base/comps/csnappy/csnappy.comp.toml

@@ -1,3 +1,3 @@
 [components.csnappy]
-# Release: 32.20211216git%{shortcommit}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 32.20211216git%{shortcommit}%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^([0-9]+)\.20211216git%\{shortcommit\}(?:%\{\??dist\})?$' } }

base/comps/cvsps/cvsps.comp.toml

@@ -1,3 +1,3 @@
 [components.cvsps]
-# Release: 0.39.b1%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 0.39.b1%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^0\.([0-9]+)\.b1(?:%\{\??dist\})?$' } }

base/comps/dbusmenu-qt/dbusmenu-qt.comp.toml

@@ -1,3 +1,3 @@
 [components.dbusmenu-qt]
-# Release: 0.37.%{snapshot}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 0.37.%{snapshot}%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^0\.([0-9]+)\.%\{snapshot\}(?:%\{\??dist\})?$' } }

base/comps/device-mapper-persistent-data/device-mapper-persistent-data.comp.toml

@@ -1,3 +1,3 @@
 [components.device-mapper-persistent-data]
-# Release: 4%{?dist}%{?release_suffix}
-release = { calculation = "manual" }
+# Upstream Release: 4%{?dist}%{?release_suffix}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^([0-9]+)(?:%\{\??dist\})?%\{\?release_suffix\}$' } }

base/comps/dialog/dialog.comp.toml

@@ -1,3 +1,3 @@
 [components.dialog]
-# Release: 55.%{dialogsubversion}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 55.%{dialogsubversion}%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^([0-9]+)\.%\{dialogsubversion\}(?:%\{\??dist\})?$' } }

base/comps/dnsmasq/dnsmasq.comp.toml

@@ -1,3 +1,3 @@
 [components.dnsmasq]
-# Release: 1%{?extraversion:.%{extraversion}}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 1%{?extraversion:.%{extraversion}}%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^([0-9]+)%\{\?extraversion:\.%\{extraversion\}\}(?:%\{\??dist\})?$' } }

base/comps/dogtag-pki/dogtag-pki.comp.toml

@@ -1,3 +1,3 @@
 [components.dogtag-pki]
-# Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
+release = { calculation = "static", counter = { source = "spec-macro", directive = "global", name = "release_number" } }

base/comps/elfutils/elfutils.comp.toml

@@ -1,6 +1,6 @@
 [components.elfutils]
-# Release: %{baserelease}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: %[%{baserelease} + %{azl_release}]%{?dist}
+release = { calculation = "static", counter = { source = "spec-macro", directive = "global", name = "baserelease" } }
 
 [components.elfutils.build.defines]
 # Azure Linux-only release delta. Keep the imported Fedora baserelease intact.

base/comps/fcoe-utils/fcoe-utils.comp.toml

@@ -1,3 +1,3 @@
 [components.fcoe-utils]
-# Release: 12.git%{shortcommit0}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 12.git%{shortcommit0}%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^([0-9]+)\.git%\{shortcommit0\}(?:%\{\??dist\})?$' } }

base/comps/fence-agents/fence-agents.comp.toml

@@ -1,3 +1,3 @@
 [components.fence-agents]
-# Release: 1%{?alphatag:.%{alphatag}}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^([0-9]+)%\{\?alphatag:\.%\{alphatag\}\}(?:%\{\??dist\})?$' } }

base/comps/firefox/firefox.comp.toml

@@ -4,7 +4,8 @@
 # so the AZL release counter is composed with — rather than replacing —
 # upstream's value. That way the only knob to turn for an AZL-only rebuild
 # is `azl_release` in build.defines below.
-release = { calculation = "manual" }
+# Upstream Release: %[1 + %{azl_release}]%{?pre_tag}%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^%\[([0-9]+) \+ %\{azl_release\}\]%\{\?pre_tag\}%\{\?dist\}$' } }
 
 [components.firefox.build.defines]
 # AZL-only release counter. Added to upstream's leading Release integer (1

base/comps/foma/foma.comp.toml

@@ -1,3 +1,3 @@
 [components.foma]
-# Release: 0.14.%{snapshotdate}git%{shortcommit0}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 0.14.%{snapshotdate}git%{shortcommit0}%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^0\.([0-9]+)\.%\{snapshotdate\}git%\{shortcommit0\}(?:%\{\??dist\})?$' } }

base/comps/freeipa/freeipa.comp.toml

@@ -1,3 +1,3 @@
 [components.freeipa]
-# Release: 5%{?rc_version:.%rc_version}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 5%{?rc_version:.%rc_version}%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^([0-9]+)%\{\?rc_version:\.%rc_version\}(?:%\{\??dist\})?$' } }

base/comps/gcc/gcc.comp.toml

@@ -1,3 +1,3 @@
 [components.gcc]
-# Release: %{gcc_release}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: %{gcc_release}%{?dist}
+release = { calculation = "static", counter = { source = "spec-macro", directive = "global", name = "gcc_release" } }

base/comps/gd/gd.comp.toml

@@ -1,6 +1,6 @@
 [components.gd]
-# Release: 19%{?prever}%{?short}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 20%{?prever}%{?short}%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^([0-9]+)%\{\?prever\}%\{\?short\}(?:%\{\??dist\})?$' } }
 
 # AZL does not ship libavif — disable avif support.
 # The avif bcond defaults ON via %bcond_without on Fedora.

base/comps/gengetopt/gengetopt.comp.toml

@@ -1,3 +1,3 @@
 [components.gengetopt]
-# Release: 16%{dist}
-release = { calculation = "manual" }
+# Upstream Release: 16%{dist}
+release = { calculation = "static" }

base/comps/glibc/glibc.comp.toml

@@ -1,6 +1,6 @@
 [components.glibc]
-# Release: %{baserelease}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: %{baserelease}%{?dist}
+release = { calculation = "static", counter = { source = "spec-macro", directive = "global", name = "baserelease" } }
 
 [[components.glibc.overlays]]
 description = "Bump the manual release for the OPEN_TREE header compatibility fix"

base/comps/glusterfs/glusterfs.comp.toml

@@ -1,3 +1,3 @@
 [components.glusterfs]
-# Release: 0.@PACKAGE_RELEASE@%{?dist}.26
-release = { calculation = "manual" }
+# Upstream Release: 4%{?prereltag:%{prereltag}}%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^([0-9]+)%\{\?prereltag:%\{prereltag\}\}%\{\?dist\}$' } }

base/comps/glyphicons-halflings-fonts/glyphicons-halflings-fonts.comp.toml

@@ -1,3 +1,3 @@
 [components.glyphicons-halflings-fonts]
-# Release: 24.%{checkout}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 24.%{checkout}%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^([0-9]+)\.%\{checkout\}(?:%\{\??dist\})?$' } }

base/comps/gnulib/gnulib.comp.toml

@@ -1,3 +1,3 @@
 [components.gnulib]
-# Release: 56.%{gitdate}git%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 56.%{gitdate}git%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^([0-9]+)\.%\{gitdate\}git(?:%\{\??dist\})?$' } }

base/comps/golang-github-macaron-inject/golang-github-macaron-inject.comp.toml

@@ -1,3 +1,3 @@
 [components.golang-github-macaron-inject]
-# Release: 0.25%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 0.25%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^0\.([0-9]+)(?:%\{\??dist\})?$' } }

base/comps/golang-github-rcrowley-metrics/golang-github-rcrowley-metrics.comp.toml

@@ -1,3 +1,3 @@
 [components.golang-github-rcrowley-metrics]
-# Release: 0.41%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 0.41%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^0\.([0-9]+)(?:%\{\??dist\})?$' } }

base/comps/google-roboto-slab-fonts/google-roboto-slab-fonts.comp.toml

@@ -1,3 +1,3 @@
 [components.google-roboto-slab-fonts]
-# Release: 0.26.20150923git%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 0.26.20150923git%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^0\.([0-9]+)\.20150923git(?:%\{\??dist\})?$' } }

base/comps/gts/gts.comp.toml

@@ -1,3 +1,3 @@
 [components.gts]
-# Release: 51.20%{snapshot}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 51.20%{snapshot}%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^([0-9]+)\.20%\{snapshot\}(?:%\{\??dist\})?$' } }

base/comps/gyp/gyp.comp.toml

@@ -1,3 +1,3 @@
 [components.gyp]
-# Release: 0.60%{?revision:.%{revision}git}%{?dist}
-release = { calculation = "manual" }
+# Upstream Release: 0.60%{?revision:.%{revision}git}%{?dist}
+release = { calculation = "static", counter = { source = "release-tag", regex = '^0\.([0-9]+)%\{\?revision:\.%\{revision\}git\}(?:%\{\??dist\})?$' } }