From 404bc7ef20c88c01c2087707334b15b7bc159089 Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Wed, 25 Mar 2026 16:17:18 +1100 Subject: [PATCH 1/3] refactor: Update to use reusable-workflow housekeeping --- .github/workflows/on-push.yaml | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/.github/workflows/on-push.yaml b/.github/workflows/on-push.yaml index 64f37b3..27bf113 100644 --- a/.github/workflows/on-push.yaml +++ b/.github/workflows/on-push.yaml @@ -13,24 +13,11 @@ jobs: container: qctrl/ci-images:python-3.11-ci steps: - uses: actions/checkout@v4 - - name: Download CI tool - shell: bash - run: | - curl -sSL http://ci.q-ctrl.com | bash - - - name: Vault Login - run: | - ./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }} - - name: Inject environment variables - run: | - /scripts/ci env prepareGitHub - - name: Perform housekeeping checks - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - git config --global --add safe.directory $GITHUB_WORKSPACE - git config --global user.email "robot@q-ctrl.com" - git config --global user.name "Q-CTRL Robot" - /scripts/housekeeping.sh + - uses: qctrl/reusable-workflows/.github/actions/vault/login@master + with: + vault-role-id: ${{ secrets.VAULT_ROLE_ID }} + vault-secret-id: ${{ secrets.VAULT_SECRET_ID }} + - uses: qctrl/reusable-workflows/.github/actions/poetry/housekeeping@actions/poetry/housekeeping/v1 linting: runs-on: ubuntu-latest From b9b2f71db6c86179b65bd93f72c0066b18420f06 Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Wed, 25 Mar 2026 16:21:48 +1100 Subject: [PATCH 2/3] add name to step --- .github/workflows/on-push.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/on-push.yaml b/.github/workflows/on-push.yaml index 27bf113..46773e2 100644 --- a/.github/workflows/on-push.yaml +++ b/.github/workflows/on-push.yaml @@ -17,7 +17,8 @@ jobs: with: vault-role-id: ${{ secrets.VAULT_ROLE_ID }} vault-secret-id: ${{ secrets.VAULT_SECRET_ID }} - - uses: qctrl/reusable-workflows/.github/actions/poetry/housekeeping@actions/poetry/housekeeping/v1 + - name: Update version in code + uses: qctrl/reusable-workflows/.github/actions/poetry/housekeeping@actions/poetry/housekeeping/v1 linting: runs-on: ubuntu-latest From 8b639f01fc2fca708830019476817c6c02e58bc5 Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Wed, 25 Mar 2026 17:01:23 +1100 Subject: [PATCH 3/3] target test branch --- .github/workflows/on-push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/on-push.yaml b/.github/workflows/on-push.yaml index 46773e2..8053329 100644 --- a/.github/workflows/on-push.yaml +++ b/.github/workflows/on-push.yaml @@ -18,7 +18,7 @@ jobs: vault-role-id: ${{ secrets.VAULT_ROLE_ID }} vault-secret-id: ${{ secrets.VAULT_SECRET_ID }} - name: Update version in code - uses: qctrl/reusable-workflows/.github/actions/poetry/housekeeping@actions/poetry/housekeeping/v1 + uses: qctrl/reusable-workflows/.github/actions/poetry/housekeeping@INFRA-3197 linting: runs-on: ubuntu-latest