From 4f586fb2e6389ddf6bb6db1181f1a230f2e17a00 Mon Sep 17 00:00:00 2001
From: Aliaksandr Adziareika <8034372+alexadereyko@users.noreply.github.com>
Date: Fri, 6 Nov 2026 19:50:17 +0100
Subject: [PATCH 1/3] Stage a given commit, called by the bundle, tagged by its
 identity, the push decided in resolve

---
 .github/workflows/stage.yml | 256 +++++++++++++++++++++++++++---------
 1 file changed, 193 insertions(+), 63 deletions(-)

diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml
index 9bb4e85..29e02ac 100644
--- a/.github/workflows/stage.yml
+++ b/.github/workflows/stage.yml
@@ -5,81 +5,80 @@ on:
     - cron: '0 2 * * 1'
   workflow_dispatch:
     inputs:
+      ref:
+        description: "The commit to stage, in full (empty: the head of the branch dispatched on)"
+        default: ""
       opendaq-ref:
         description: "openDAQ commit, branch or tag. If empty, uses the opendaq_ref file from the repo."
         default: ""
-
+      skip-staging-push:
+        description: "Build only, keep the staging as an artifact of the run"
+        type: boolean
+        default: false
+  # from another repository's run (the bundle): staged as an artifact of that run, never pushed
+  workflow_call:
+    inputs:
+      ref:
+        description: "The commit to stage, in full (empty: the commit this workflow is called at)"
+        type: string
+        default: ""
+      opendaq-ref:
+        description: "openDAQ commit, branch or tag. If empty, uses the opendaq_ref file from the repo."
+        type: string
+        default: ""
 
 jobs:
   resolve:
-    name: Resolve the core commit
+    name: Resolve the commits
     runs-on: ubuntu-latest
     outputs:
-      opendaq-ref: ${{ steps.core.outputs.ref }}
+      ref: ${{ steps.commits.outputs.ref }}
+      opendaq-ref: ${{ steps.commits.outputs.opendaq-ref }}
+      opendaq-channel: ${{ fromJSON(steps.channel.outputs.depends-channels)['openDAQ/openDAQ'] || 'dev' }}
+      repository: ${{ job.workflow_repository }}
       channel: ${{ steps.channel.outputs.channel }}
-      jobs: ${{ steps.stagings.outputs.jobs }}
-      staging-pull: ${{ steps.stagings.outputs.staging-pull }}
-      opendaq-artifacts: ${{ steps.stagings.outputs.opendaq-artifacts }}
+      skip-staging-push: ${{ inputs.skip-staging-push || job.workflow_ref != github.workflow_ref || (github.event_name == 'schedule' && steps.channel.outputs.released != 'true') }}
     steps:
+      # this repository, also when called from another one
       - uses: actions/checkout@v4
+        with:
+          repository: ${{ job.workflow_repository }}
+          ref: ${{ inputs.ref || job.workflow_sha }}
 
-      - uses: openDAQ/openDAQ-CI/.github/actions/resolve-channel@v4
-        id: channel
-
-      # the input, or else opendaq_ref; a branch or a tag is resolved to the commit, which is
-      # what the core staging is found by and what this staging records
-      - name: Resolve the core commit
-        id: core
-        shell: bash
-        env:
-          REF: ${{ inputs.opendaq-ref }}
-        run: |
-          ref="${REF:-$(cat opendaq_ref)}"
-          sha="$ref"
-          if ! [[ "$ref" =~ ^[0-9a-f]{40}$ ]]; then
-            sha=$(git ls-remote https://github.com/openDAQ/openDAQ "$ref" "$ref^{}" | sort -k2 | tail -1 | cut -f1)
-          fi
-          [ -n "$sha" ] || { echo "::error::$ref names no openDAQ commit"; exit 1; }
-          echo "core: $ref -> $sha"
-          echo "ref=$sha" >> "$GITHUB_OUTPUT"
-
-      # the jobs to build, and the openDAQ staging each of them builds against
-      - name: Request the openDAQ stagings
-        id: stagings
+      # the commit staged and the core it is built against; a branch or a tag of the core is resolved to the commit,
+      # which is what the core staging is found by and what this staging records
+      - name: Resolve the commits
+        id: commits
         shell: python3 {0}
         env:
-          CHANNEL: ${{ steps.channel.outputs.channel }}
-          OPENDAQ_REF: ${{ steps.core.outputs.ref }}
+          OPENDAQ_REF: ${{ inputs.opendaq-ref }}
         run: |
-          import json, os
-
-          # job -> the openDAQ staging it builds against, by triplet
-          opendaq = {
-              "windows-2022-x86_64-msvs-v143-release":       "x86_64-windows-msvc-143-release",
-              "windows-2022-x86-msvs-v143-release":          "x86-windows-msvc-143-release",
-              "manylinux_2_28-x86_64-ninja-gcc-14-release":  "x86_64-manylinux_2_28-gcc-14-release",
-              "manylinux_2_28-armv8-ninja-gcc-14-release":   "armv8-manylinux_2_28-gcc-14-release",
-              "ubuntu-22.04-x86_64-ninja-gcc-release":       "x86_64-linux-gcc-11-release",
-              "ubuntu-22.04-armv8-ninja-gcc-release":        "armv8-linux-gcc-11-release",
-              "macos-26-x86_64-ninja-appleclang-21-release": "x86_64-macos-apple-clang-21-release",
-              "macos-26-armv8-ninja-appleclang-21-release":  "armv8-macos-apple-clang-21-release",
-          }
+          import os, re, subprocess, sys
 
-          # each staging, of the resolved commit, as an artifact of its own ...
-          pull = [{"artifact": f"opendaq-{triplet}", "packages": [{
-                      "path": f"ghcr.io/openDAQ/{os.environ['CHANNEL']}/staging/opendaq",
-                      "annotations": {"org.opencontainers.image.revision": os.environ["OPENDAQ_REF"],
-                                      "com.opendaq.package.triplet": triplet}}]}
-                  for triplet in opendaq.values()]
+          sha = subprocess.run(["git", "rev-parse", "HEAD"], capture_output=True, text=True, check=True).stdout.strip()
 
-          # ... which its job unpacks into staging-deps
-          artifacts = [{"match-jobs": [job], "artifacts": [{"name": f"opendaq-{triplet}", "dir": "staging-deps"}]}
-                       for job, triplet in opendaq.items()]
+          # the input, or else opendaq_ref
+          core = os.environ["OPENDAQ_REF"] or open("opendaq_ref").read().strip()
+          if not re.fullmatch(r"[0-9a-f]{40}", core):
+              out = subprocess.run(["git", "ls-remote", "https://github.com/openDAQ/openDAQ", core, f"{core}^{{}}"],
+                                   capture_output=True, text=True, check=True).stdout
+              # the peeled tag (X^{}) sorts last, so a tag gives its commit, not the tag object
+              core = sorted(out.splitlines(), key=lambda line: line.split("\t")[1])[-1].split("\t")[0] if out else ""
+          if not core:
+              sys.exit(f"::error::{os.environ['OPENDAQ_REF'] or 'opendaq_ref'} names no openDAQ commit")
 
           with open(os.environ["GITHUB_OUTPUT"], "a") as f:
-              f.write(f"jobs={json.dumps(list(opendaq))}\n")
-              f.write(f"staging-pull={json.dumps(pull)}\n")
-              f.write(f"opendaq-artifacts={json.dumps(artifacts)[1:-1]}\n")   # no brackets: it goes inside packages
+              f.write(f"ref={sha}\n")
+              f.write(f"opendaq-ref={core}\n")
+
+      # where each lies picks its channel
+      - uses: openDAQ/openDAQ-CI/.github/actions/resolve-channel@bundle/extract-each-artifact-into-its-dir
+        id: channel
+        with:
+          repository: ${{ job.workflow_repository }}
+          commit: ${{ steps.commits.outputs.ref }}
+          depends: '{"openDAQ/openDAQ": "${{ steps.commits.outputs.opendaq-ref }}"}'
+
 
   stage:
     needs: resolve
@@ -87,12 +86,141 @@ jobs:
     permissions:
       contents: read
       packages: write
-    uses: openDAQ/openDAQ-CI/.github/workflows/stage.yml@v4
+    uses: openDAQ/openDAQ-CI/.github/workflows/stage.yml@bundle/extract-each-artifact-into-its-dir
     with:
+      repository: ${{ needs.resolve.outputs.repository }}
+      ref: ${{ needs.resolve.outputs.ref }}
+      upload-pattern: mqtt-module-*
       timeout: '[{"timeout-minutes": 180}]'
-      include-jobs: ${{ needs.resolve.outputs.jobs }}
-      staging-pull: ${{ needs.resolve.outputs.staging-pull }}
-      packages: '[ ${{ needs.resolve.outputs.opendaq-artifacts }} ]'
+      include-jobs: >-
+        [
+          "windows-2022-x86_64-msvs-v143-release",
+          "windows-2022-x86-msvs-v143-release",
+          "manylinux_2_28-x86_64-ninja-gcc-14-release",
+          "manylinux_2_28-armv8-ninja-gcc-14-release",
+          "ubuntu-22.04-x86_64-ninja-gcc-release",
+          "ubuntu-22.04-armv8-ninja-gcc-release",
+          "macos-26-x86_64-ninja-appleclang-21-release",
+          "macos-26-armv8-ninja-appleclang-21-release"
+        ]
+      staging-pull: >-
+        [
+          {
+            "artifact": "opendaq-staging-windows-2022-x86_64-msvs-v143-release",
+            "packages": [{
+              "path": "ghcr.io/${{ github.repository_owner }}/${{ needs.resolve.outputs.opendaq-channel }}/staging/opendaq",
+              "annotations": {
+                "org.opencontainers.image.revision": "${{ needs.resolve.outputs.opendaq-ref }}",
+                "com.opendaq.package.triplet": "x86_64-windows-msvc-143-release"
+              }
+            }]
+          },
+          {
+            "artifact": "opendaq-staging-windows-2022-x86-msvs-v143-release",
+            "packages": [{
+              "path": "ghcr.io/${{ github.repository_owner }}/${{ needs.resolve.outputs.opendaq-channel }}/staging/opendaq",
+              "annotations": {
+                "org.opencontainers.image.revision": "${{ needs.resolve.outputs.opendaq-ref }}",
+                "com.opendaq.package.triplet": "x86-windows-msvc-143-release"
+              }
+            }]
+          },
+          {
+            "artifact": "opendaq-staging-manylinux_2_28-x86_64-ninja-gcc-14-release",
+            "packages": [{
+              "path": "ghcr.io/${{ github.repository_owner }}/${{ needs.resolve.outputs.opendaq-channel }}/staging/opendaq",
+              "annotations": {
+                "org.opencontainers.image.revision": "${{ needs.resolve.outputs.opendaq-ref }}",
+                "com.opendaq.package.triplet": "x86_64-manylinux_2_28-gcc-14-release"
+              }
+            }]
+          },
+          {
+            "artifact": "opendaq-staging-manylinux_2_28-armv8-ninja-gcc-14-release",
+            "packages": [{
+              "path": "ghcr.io/${{ github.repository_owner }}/${{ needs.resolve.outputs.opendaq-channel }}/staging/opendaq",
+              "annotations": {
+                "org.opencontainers.image.revision": "${{ needs.resolve.outputs.opendaq-ref }}",
+                "com.opendaq.package.triplet": "armv8-manylinux_2_28-gcc-14-release"
+              }
+            }]
+          },
+          {
+            "artifact": "opendaq-staging-ubuntu-22.04-x86_64-ninja-gcc-release",
+            "packages": [{
+              "path": "ghcr.io/${{ github.repository_owner }}/${{ needs.resolve.outputs.opendaq-channel }}/staging/opendaq",
+              "annotations": {
+                "org.opencontainers.image.revision": "${{ needs.resolve.outputs.opendaq-ref }}",
+                "com.opendaq.package.triplet": "x86_64-linux-gcc-11-release"
+              }
+            }]
+          },
+          {
+            "artifact": "opendaq-staging-ubuntu-22.04-armv8-ninja-gcc-release",
+            "packages": [{
+              "path": "ghcr.io/${{ github.repository_owner }}/${{ needs.resolve.outputs.opendaq-channel }}/staging/opendaq",
+              "annotations": {
+                "org.opencontainers.image.revision": "${{ needs.resolve.outputs.opendaq-ref }}",
+                "com.opendaq.package.triplet": "armv8-linux-gcc-11-release"
+              }
+            }]
+          },
+          {
+            "artifact": "opendaq-staging-macos-26-x86_64-ninja-appleclang-21-release",
+            "packages": [{
+              "path": "ghcr.io/${{ github.repository_owner }}/${{ needs.resolve.outputs.opendaq-channel }}/staging/opendaq",
+              "annotations": {
+                "org.opencontainers.image.revision": "${{ needs.resolve.outputs.opendaq-ref }}",
+                "com.opendaq.package.triplet": "x86_64-macos-apple-clang-21-release"
+              }
+            }]
+          },
+          {
+            "artifact": "opendaq-staging-macos-26-armv8-ninja-appleclang-21-release",
+            "packages": [{
+              "path": "ghcr.io/${{ github.repository_owner }}/${{ needs.resolve.outputs.opendaq-channel }}/staging/opendaq",
+              "annotations": {
+                "org.opencontainers.image.revision": "${{ needs.resolve.outputs.opendaq-ref }}",
+                "com.opendaq.package.triplet": "armv8-macos-apple-clang-21-release"
+              }
+            }]
+          }
+        ]
+      packages: >-
+        [
+          {
+            "match-jobs": ["windows-2022-x86_64-msvs-v143-release"],
+            "artifacts": [{"name": "opendaq-staging-windows-2022-x86_64-msvs-v143-release", "dir": "staging-deps"}]
+          },
+          {
+            "match-jobs": ["windows-2022-x86-msvs-v143-release"],
+            "artifacts": [{"name": "opendaq-staging-windows-2022-x86-msvs-v143-release", "dir": "staging-deps"}]
+          },
+          {
+            "match-jobs": ["manylinux_2_28-x86_64-ninja-gcc-14-release"],
+            "artifacts": [{"name": "opendaq-staging-manylinux_2_28-x86_64-ninja-gcc-14-release", "dir": "staging-deps"}]
+          },
+          {
+            "match-jobs": ["manylinux_2_28-armv8-ninja-gcc-14-release"],
+            "artifacts": [{"name": "opendaq-staging-manylinux_2_28-armv8-ninja-gcc-14-release", "dir": "staging-deps"}]
+          },
+          {
+            "match-jobs": ["ubuntu-22.04-x86_64-ninja-gcc-release"],
+            "artifacts": [{"name": "opendaq-staging-ubuntu-22.04-x86_64-ninja-gcc-release", "dir": "staging-deps"}]
+          },
+          {
+            "match-jobs": ["ubuntu-22.04-armv8-ninja-gcc-release"],
+            "artifacts": [{"name": "opendaq-staging-ubuntu-22.04-armv8-ninja-gcc-release", "dir": "staging-deps"}]
+          },
+          {
+            "match-jobs": ["macos-26-x86_64-ninja-appleclang-21-release"],
+            "artifacts": [{"name": "opendaq-staging-macos-26-x86_64-ninja-appleclang-21-release", "dir": "staging-deps"}]
+          },
+          {
+            "match-jobs": ["macos-26-armv8-ninja-appleclang-21-release"],
+            "artifacts": [{"name": "opendaq-staging-macos-26-armv8-ninja-appleclang-21-release", "dir": "staging-deps"}]
+          }
+        ]
       cmake-presets: >-
         [
           {
@@ -120,11 +248,13 @@ jobs:
             "stagings": [{"name": "mqtt"}]
           }
         ]
+      skip-staging-push: ${{ needs.resolve.outputs.skip-staging-push == 'true' }}
       staging-push: >-
         [
           {
-            "path": "ghcr.io/${{ github.repository_owner }}/${{ needs.resolve.outputs.channel }}/staging/mqtt-module",
-            "artifacts": ["staging-*/mqtt"],
-            "tags": ["latest"]
+            "path": "ghcr.io/${{ github.repository_owner }}/${{ needs.resolve.outputs.channel || 'dev' }}/staging/mqtt-module",
+            "artifacts": ["mqtt-module-staging-*/mqtt"],
+            "idx-identity": ["org.opencontainers.image.revision", "com.opendaq.dependencies.opendaq.revision"],
+            "pkg-identity": ["org.opencontainers.image.revision", "com.opendaq.dependencies.opendaq.revision", "com.opendaq.package.triplet"]
           }
         ]

From 980eeff8904f13195eb851e2bd666f91165f4ca0 Mon Sep 17 00:00:00 2001
From: Aliaksandr Adziareika <8034372+alexadereyko@users.noreply.github.com>
Date: Sat, 7 Nov 2026 11:53:28 +0100
Subject: [PATCH 2/3] Take the jobs not built from the caller, and pull no
 openDAQ staging for them

---
 .github/workflows/stage.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml
index 29e02ac..1113b7c 100644
--- a/.github/workflows/stage.yml
+++ b/.github/workflows/stage.yml
@@ -26,6 +26,10 @@ on:
         description: "openDAQ commit, branch or tag. If empty, uses the opendaq_ref file from the repo."
         type: string
         default: ""
+      exclude-jobs:
+        description: "Jobs not built, wildcard patterns, e.g. '[\"manylinux*\"]': their openDAQ stagings not pulled either"
+        type: string
+        default: "[]"
 
 jobs:
   resolve:
@@ -103,9 +107,11 @@ jobs:
           "macos-26-x86_64-ninja-appleclang-21-release",
           "macos-26-armv8-ninja-appleclang-21-release"
         ]
+      exclude-jobs: ${{ inputs.exclude-jobs || '[]' }}
       staging-pull: >-
         [
           {
+            "match-jobs": ["windows-2022-x86_64-msvs-v143-release"],
             "artifact": "opendaq-staging-windows-2022-x86_64-msvs-v143-release",
             "packages": [{
               "path": "ghcr.io/${{ github.repository_owner }}/${{ needs.resolve.outputs.opendaq-channel }}/staging/opendaq",
@@ -116,6 +122,7 @@ jobs:
             }]
           },
           {
+            "match-jobs": ["windows-2022-x86-msvs-v143-release"],
             "artifact": "opendaq-staging-windows-2022-x86-msvs-v143-release",
             "packages": [{
               "path": "ghcr.io/${{ github.repository_owner }}/${{ needs.resolve.outputs.opendaq-channel }}/staging/opendaq",
@@ -126,6 +133,7 @@ jobs:
             }]
           },
           {
+            "match-jobs": ["manylinux_2_28-x86_64-ninja-gcc-14-release"],
             "artifact": "opendaq-staging-manylinux_2_28-x86_64-ninja-gcc-14-release",
             "packages": [{
               "path": "ghcr.io/${{ github.repository_owner }}/${{ needs.resolve.outputs.opendaq-channel }}/staging/opendaq",
@@ -136,6 +144,7 @@ jobs:
             }]
           },
           {
+            "match-jobs": ["manylinux_2_28-armv8-ninja-gcc-14-release"],
             "artifact": "opendaq-staging-manylinux_2_28-armv8-ninja-gcc-14-release",
             "packages": [{
               "path": "ghcr.io/${{ github.repository_owner }}/${{ needs.resolve.outputs.opendaq-channel }}/staging/opendaq",
@@ -146,6 +155,7 @@ jobs:
             }]
           },
           {
+            "match-jobs": ["ubuntu-22.04-x86_64-ninja-gcc-release"],
             "artifact": "opendaq-staging-ubuntu-22.04-x86_64-ninja-gcc-release",
             "packages": [{
               "path": "ghcr.io/${{ github.repository_owner }}/${{ needs.resolve.outputs.opendaq-channel }}/staging/opendaq",
@@ -156,6 +166,7 @@ jobs:
             }]
           },
           {
+            "match-jobs": ["ubuntu-22.04-armv8-ninja-gcc-release"],
             "artifact": "opendaq-staging-ubuntu-22.04-armv8-ninja-gcc-release",
             "packages": [{
               "path": "ghcr.io/${{ github.repository_owner }}/${{ needs.resolve.outputs.opendaq-channel }}/staging/opendaq",
@@ -166,6 +177,7 @@ jobs:
             }]
           },
           {
+            "match-jobs": ["macos-26-x86_64-ninja-appleclang-21-release"],
             "artifact": "opendaq-staging-macos-26-x86_64-ninja-appleclang-21-release",
             "packages": [{
               "path": "ghcr.io/${{ github.repository_owner }}/${{ needs.resolve.outputs.opendaq-channel }}/staging/opendaq",
@@ -176,6 +188,7 @@ jobs:
             }]
           },
           {
+            "match-jobs": ["macos-26-armv8-ninja-appleclang-21-release"],
             "artifact": "opendaq-staging-macos-26-armv8-ninja-appleclang-21-release",
             "packages": [{
               "path": "ghcr.io/${{ github.repository_owner }}/${{ needs.resolve.outputs.opendaq-channel }}/staging/opendaq",

From a94532cf583624e6c28d3626a2b56cf5d8378966 Mon Sep 17 00:00:00 2001
From: Aliaksandr Adziareika <8034372+alexadereyko@users.noreply.github.com>
Date: Tue, 10 Nov 2026 10:22:25 +0100
Subject: [PATCH 3/3] Take a sha, branch or tag as the commit to stage, as
 checkout does

---
 .github/workflows/stage.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml
index 1113b7c..3c84105 100644
--- a/.github/workflows/stage.yml
+++ b/.github/workflows/stage.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
     inputs:
       ref:
-        description: "The commit to stage, in full (empty: the head of the branch dispatched on)"
+        description: "The commit to stage: a sha, branch or tag (empty: the head of the branch dispatched on)"
         default: ""
       opendaq-ref:
         description: "openDAQ commit, branch or tag. If empty, uses the opendaq_ref file from the repo."
@@ -19,7 +19,7 @@ on:
   workflow_call:
     inputs:
       ref:
-        description: "The commit to stage, in full (empty: the commit this workflow is called at)"
+        description: "The commit to stage: a sha, branch or tag (empty: the commit this workflow is called at)"
         type: string
         default: ""
       opendaq-ref: