From 84cfd7a4f2ba8d3d63554f2696b3598161ea5975 Mon Sep 17 00:00:00 2001
From: Joel Cumberland <joel.cumberland@q-ctrl.com>
Date: Wed, 26 Mar 2025 10:44:07 +1100
Subject: [PATCH 1/2] ci: Add new reuseable on-push python workflows

Updated CI workflow to use the latest Python on-push resuseable
workflows for linting, building, and internal publishing.

This ensures consistency, improves automation, and makes it easier to
manage any future changes.
---
 .github/workflows/on-push.yaml | 58 ++++++----------------------------
 1 file changed, 10 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/on-push.yaml b/.github/workflows/on-push.yaml
index bb9564d..dd87bcf 100644
--- a/.github/workflows/on-push.yaml
+++ b/.github/workflows/on-push.yaml
@@ -8,55 +8,17 @@ on:
       - "*.*"
 
 jobs:
-  housekeeping:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Perform housekeeping checks
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          source <(curl -sL http://ci.q-ctrl.com)
-          ./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
-          ./ci docker run qctrl/ci-images:python-3.11-ci /scripts/housekeeping.sh
 
-  linting:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install Python dependencies
-        run: |
-          source <(curl -sL http://ci.q-ctrl.com)
-          ./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
-          ./ci docker run qctrl/ci-images:python-3.11-ci /scripts/install-python-dependencies.sh
-      - name: Run Pre-Commit
-        run: |
-          ./ci docker run qctrl/ci-images:python-3.11-ci poetry run pre-commit run -- -a
+  pre-checks:
+    uses: qctrl/reusable-workflows/.github/workflows/poetry-pre-checks.yaml@master
+    secrets: inherit
 
   pytest:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python: ["3.9", "3.10", "3.11"]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install Python dependencies
-        run: |
-          source <(curl -sL http://ci.q-ctrl.com)
-          ./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
-          ./ci docker run qctrl/ci-images:python-${{ matrix.python }}-ci /scripts/install-python-dependencies.sh
-      - name: Run Pytest
-        run: |
-          ./ci docker run qctrl/ci-images:python-${{ matrix.python }}-ci /scripts/pytest.sh
+    uses: qctrl/reusable-workflows/.github/workflows/pytest.yaml@master
+    secrets: inherit
+    with:
+      python-versions: '["3.9", "3.10", "3.11"]'
 
-  publish_internally:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Publish development version
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          source <(curl -sL http://ci.q-ctrl.com)
-          ./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
-          ./ci docker run qctrl/ci-images:python-3.11-ci /scripts/publish-dev-version.sh
+  publish:
+    uses: qctrl/reusable-workflows/.github/workflows/poetry-publish-development.yaml@master
+    secrets: inherit

From cee4ff96796fc91fb8e5faa6d2593ad63dbf2243 Mon Sep 17 00:00:00 2001
From: Joel Cumberland <joel.cumberland@q-ctrl.com>
Date: Fri, 4 Apr 2025 08:46:27 +1100
Subject: [PATCH 2/2] ci: add container parameters input

---
 .github/workflows/on-push.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/on-push.yaml b/.github/workflows/on-push.yaml
index dd87bcf..848c9ee 100644
--- a/.github/workflows/on-push.yaml
+++ b/.github/workflows/on-push.yaml
@@ -12,6 +12,8 @@ jobs:
   pre-checks:
     uses: qctrl/reusable-workflows/.github/workflows/poetry-pre-checks.yaml@master
     secrets: inherit
+    with:
+      container: "qctrl/ci-images:python-3.11-ci"
 
   pytest:
     uses: qctrl/reusable-workflows/.github/workflows/pytest.yaml@master
@@ -22,3 +24,5 @@ jobs:
   publish:
     uses: qctrl/reusable-workflows/.github/workflows/poetry-publish-development.yaml@master
     secrets: inherit
+    with:
+      container: "qctrl/ci-images:python-3.11-ci"