From c006038c253dfc493b173f12992b6783c8bb9a01 Mon Sep 17 00:00:00 2001 From: Francois LaBerge Date: Wed, 5 Mar 2025 22:57:53 -0500 Subject: [PATCH 1/2] Refactor workflows --- .github/workflows/{ => callable}/codeql.yaml | 3 ++- .../workflows/{ => callable}/publish-test.yaml | 8 +------- .github/workflows/{ => callable}/publish.yaml | 4 +--- .github/workflows/{ => callable}/test.yaml | 3 ++- .github/workflows/pr.yaml | 11 +++++++++++ .github/workflows/release-staging.yaml | 18 ++++++++++++++++++ .github/workflows/release.yaml | 11 +++++++++++ 7 files changed, 46 insertions(+), 12 deletions(-) rename .github/workflows/{ => callable}/codeql.yaml (98%) rename .github/workflows/{ => callable}/publish-test.yaml (93%) rename .github/workflows/{ => callable}/publish.yaml (93%) rename .github/workflows/{ => callable}/test.yaml (97%) create mode 100644 .github/workflows/pr.yaml create mode 100644 .github/workflows/release-staging.yaml create mode 100644 .github/workflows/release.yaml diff --git a/.github/workflows/codeql.yaml b/.github/workflows/callable/codeql.yaml similarity index 98% rename from .github/workflows/codeql.yaml rename to .github/workflows/callable/codeql.yaml index 7659378..94a1638 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/callable/codeql.yaml @@ -1,6 +1,7 @@ name: CodeQL -on: [ push ] +on: + workflow_call: jobs: formatting: diff --git a/.github/workflows/publish-test.yaml b/.github/workflows/callable/publish-test.yaml similarity index 93% rename from .github/workflows/publish-test.yaml rename to .github/workflows/callable/publish-test.yaml index 744a614..f87b9f6 100644 --- a/.github/workflows/publish-test.yaml +++ b/.github/workflows/callable/publish-test.yaml @@ -1,13 +1,7 @@ name: Publish to test Pypi on: - workflow_run: - workflows: - - "Unit tests" - branches: - - main - types: - - completed + workflow_call: jobs: publish-package: diff --git a/.github/workflows/publish.yaml b/.github/workflows/callable/publish.yaml similarity index 93% rename from .github/workflows/publish.yaml rename to .github/workflows/callable/publish.yaml index 7d348eb..9931dd9 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/callable/publish.yaml @@ -1,9 +1,7 @@ name: Publish to Pypi on: - release: - types: - - published + workflow_call: jobs: publish-test: diff --git a/.github/workflows/test.yaml b/.github/workflows/callable/test.yaml similarity index 97% rename from .github/workflows/test.yaml rename to .github/workflows/callable/test.yaml index a2db696..aa6ae4e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/callable/test.yaml @@ -1,6 +1,7 @@ name: Unit tests -on: [ push ] +on: + workflow_call: jobs: unit-test: diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml new file mode 100644 index 0000000..cc73811 --- /dev/null +++ b/.github/workflows/pr.yaml @@ -0,0 +1,11 @@ +name: Pull Request Checks + +on: [ push ] + +jobs: + code-quality: + name: Check code quality + uses: ./.github/workflows/callable/codeql.yaml + test: + name: Run tests + uses: ./.github/workflows/callable/test.yaml diff --git a/.github/workflows/release-staging.yaml b/.github/workflows/release-staging.yaml new file mode 100644 index 0000000..69f310c --- /dev/null +++ b/.github/workflows/release-staging.yaml @@ -0,0 +1,18 @@ +name: Release on Staging + +on: + push: + branches: + - main + +jobs: + code-quality: + name: Check code quality + uses: ./.github/workflows/callable/codeql.yaml + test: + name: Run tests + uses: ./.github/workflows/callable/test.yaml + publish: + name: Publish staging release + uses: ./.github/workflows/callable/publish-test.yaml + needs: [code-quality, test] diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 0000000..eb79461 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,11 @@ +name: Release + +on: + release: + types: + - published + +jobs: + publish: + name: Publish release + uses: ./.github/workflows/callable/publish.yaml From fe6cc3b530db4e2dd7516e9f933e289437089d4c Mon Sep 17 00:00:00 2001 From: Francois LaBerge Date: Wed, 5 Mar 2025 23:00:59 -0500 Subject: [PATCH 2/2] change workflow directories --- .github/workflows/{callable => }/codeql.yaml | 0 .github/workflows/pr.yaml | 4 ++-- .github/workflows/{callable => }/publish-test.yaml | 0 .github/workflows/{callable => }/publish.yaml | 0 .github/workflows/release-staging.yaml | 6 +++--- .github/workflows/release.yaml | 2 +- .github/workflows/{callable => }/test.yaml | 0 7 files changed, 6 insertions(+), 6 deletions(-) rename .github/workflows/{callable => }/codeql.yaml (100%) rename .github/workflows/{callable => }/publish-test.yaml (100%) rename .github/workflows/{callable => }/publish.yaml (100%) rename .github/workflows/{callable => }/test.yaml (100%) diff --git a/.github/workflows/callable/codeql.yaml b/.github/workflows/codeql.yaml similarity index 100% rename from .github/workflows/callable/codeql.yaml rename to .github/workflows/codeql.yaml diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index cc73811..b6f54b2 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -5,7 +5,7 @@ on: [ push ] jobs: code-quality: name: Check code quality - uses: ./.github/workflows/callable/codeql.yaml + uses: ./.github/workflows/codeql.yaml test: name: Run tests - uses: ./.github/workflows/callable/test.yaml + uses: ./.github/workflows/test.yaml diff --git a/.github/workflows/callable/publish-test.yaml b/.github/workflows/publish-test.yaml similarity index 100% rename from .github/workflows/callable/publish-test.yaml rename to .github/workflows/publish-test.yaml diff --git a/.github/workflows/callable/publish.yaml b/.github/workflows/publish.yaml similarity index 100% rename from .github/workflows/callable/publish.yaml rename to .github/workflows/publish.yaml diff --git a/.github/workflows/release-staging.yaml b/.github/workflows/release-staging.yaml index 69f310c..971a5af 100644 --- a/.github/workflows/release-staging.yaml +++ b/.github/workflows/release-staging.yaml @@ -8,11 +8,11 @@ on: jobs: code-quality: name: Check code quality - uses: ./.github/workflows/callable/codeql.yaml + uses: ./.github/workflows/codeql.yaml test: name: Run tests - uses: ./.github/workflows/callable/test.yaml + uses: ./.github/workflows/test.yaml publish: name: Publish staging release - uses: ./.github/workflows/callable/publish-test.yaml + uses: ./.github/workflows/publish-test.yaml needs: [code-quality, test] diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index eb79461..ec42296 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -8,4 +8,4 @@ on: jobs: publish: name: Publish release - uses: ./.github/workflows/callable/publish.yaml + uses: ./.github/workflows/publish.yaml diff --git a/.github/workflows/callable/test.yaml b/.github/workflows/test.yaml similarity index 100% rename from .github/workflows/callable/test.yaml rename to .github/workflows/test.yaml