From 2b70c521fb7661254daa04332852856f1ea31688 Mon Sep 17 00:00:00 2001 From: Phil Rogers Date: Thu, 14 Aug 2025 21:08:23 +0000 Subject: [PATCH 1/5] to run at closure, before merge to main --- .github/workflows/run_qaqc.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run_qaqc.yaml b/.github/workflows/run_qaqc.yaml index 92ca4d4..624291d 100644 --- a/.github/workflows/run_qaqc.yaml +++ b/.github/workflows/run_qaqc.yaml @@ -2,6 +2,7 @@ name: qaqc on: pull_request: + types: [opened, reopened, synchronize, closed] push: branches: [main] @@ -31,12 +32,12 @@ jobs: poetry run pytest - name: Build badge - if: ${{ github.event_name == 'push' && github.ref_name == 'main' }} + if: ${{ github.event_name == 'pull_request' && github.envent.pull_request.type == 'closed' }} run: | poetry run coverage-badge -f -o docs/assets/badges/coverage.svg echo '' >> docs/assets/badges/coverage.svg git config user.name "${{ github.actor }}" git config user.email "${{ github.actor }}@users.noreply.github.com" git add docs/assets/badges/coverage.svg - git commit -m "Update coverage badge" + git commit -m "Updated coverage badge" git push origin HEAD:${{ github.head_ref }} From b8ee8442a48581139bbf5e395f381927dd8b4b97 Mon Sep 17 00:00:00 2001 From: Phil Rogers Date: Thu, 14 Aug 2025 21:08:33 +0000 Subject: [PATCH 2/5] version bump --- changelog.md | 6 ++++++ pyproject.toml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 3959175..54cf6e8 100644 --- a/changelog.md +++ b/changelog.md @@ -8,6 +8,12 @@ The versioning pattern is `YYYY.MM.DD.micro(a/b/{none if release}) --- +## [2025.08.14.2a] + +### Fixes + +- Iteration on last update since main is the default branch only neads to push to HEAD (not HEAD:) + ## [2025.08.14.1a] ### Fixes diff --git a/pyproject.toml b/pyproject.toml index 05ba1ee..bbfb635 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cfa.dataops" -version = "2025.08.14.1a" +version = "2025.08.14.2a" description = "Data cataloging, ETL, modeling, verification, and validation for CFA" authors = [ { name = "Phil Rogers", email = "ap66@cdc.gov" }, From c3ac0614d0016b3f7f6486c01f81a939964d01de Mon Sep 17 00:00:00 2001 From: Phil Rogers Date: Thu, 14 Aug 2025 21:14:48 +0000 Subject: [PATCH 3/5] removing head_ref to be safe --- .github/workflows/run_qaqc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_qaqc.yaml b/.github/workflows/run_qaqc.yaml index 624291d..1bb6e0e 100644 --- a/.github/workflows/run_qaqc.yaml +++ b/.github/workflows/run_qaqc.yaml @@ -40,4 +40,4 @@ jobs: git config user.email "${{ github.actor }}@users.noreply.github.com" git add docs/assets/badges/coverage.svg git commit -m "Updated coverage badge" - git push origin HEAD:${{ github.head_ref }} + git push origin HEAD From 4d03cf9f5810346f91eb470a3e13bdbaac326fdd Mon Sep 17 00:00:00 2001 From: Phil Rogers Date: Thu, 14 Aug 2025 21:16:07 +0000 Subject: [PATCH 4/5] more context added --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index 54cf6e8..cf86316 100644 --- a/changelog.md +++ b/changelog.md @@ -13,6 +13,7 @@ The versioning pattern is `YYYY.MM.DD.micro(a/b/{none if release}) ### Fixes - Iteration on last update since main is the default branch only neads to push to HEAD (not HEAD:) +- Changing condition to on pull_request closure instead of push to main ## [2025.08.14.1a] From 77fd2118cc78762f46ce7271a40d093979c48bb6 Mon Sep 17 00:00:00 2001 From: Phil Rogers Date: Thu, 14 Aug 2025 21:16:42 +0000 Subject: [PATCH 5/5] typo --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index cf86316..1d8e634 100644 --- a/changelog.md +++ b/changelog.md @@ -12,7 +12,7 @@ The versioning pattern is `YYYY.MM.DD.micro(a/b/{none if release}) ### Fixes -- Iteration on last update since main is the default branch only neads to push to HEAD (not HEAD:) +- Iteration on last update since main is the default branch only needs to push to HEAD (not HEAD:) - Changing condition to on pull_request closure instead of push to main ## [2025.08.14.1a]