diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 998130d..b5a9404 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,23 +1,27 @@ name: Deploy DataOps Worker on: - pull_request: - types: [closed] - branches: [main, 'release/**', 'feature/**'] workflow_dispatch: + inputs: + chart_ref: + description: > + sientia-helm-chart branch to bump GITHUB_BRANCH on AND deploy — the literal + deploy target. Validated via git ls-remote; a branch that does not exist in + sientia-helm-chart is a hard error, not a silent fallback to main. + required: true + type: string permissions: contents: write id-token: write - pull-requests: read jobs: deploy: name: Deploy - if: github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true uses: Aignosi/github_workflow_templates/.github/workflows/reusable-deploy-dataops.yml@main with: - branch_name: ${{ github.event.pull_request.head.ref }} + branch_name: ${{ github.ref_name }} + chart_ref: ${{ inputs.chart_ref }} project_name: 'ingestor' chart_name: 'opc-ingestor' env_list_path: '[".env"]' diff --git a/.github/workflows/quality-gate.yml b/.github/workflows/quality-gate.yml index fa5f41d..bfe3582 100644 --- a/.github/workflows/quality-gate.yml +++ b/.github/workflows/quality-gate.yml @@ -5,7 +5,6 @@ on: branches: - main - 'release/**' - - 'feature/**' pull_request: branches: - main diff --git a/.github/workflows/require-chart-ref-label.yml b/.github/workflows/require-chart-ref-label.yml deleted file mode 100644 index 20f8be3..0000000 --- a/.github/workflows/require-chart-ref-label.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Require chart-ref label - -on: - pull_request: - types: [opened, synchronize, reopened, labeled, unlabeled] - branches: - - main - - 'release/**' - - 'feature/**' - -permissions: - pull-requests: write - -jobs: - require-chart-ref-label: - uses: Aignosi/github_workflow_templates/.github/workflows/require-chart-ref-label.yml@main diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml new file mode 100644 index 0000000..11dec02 --- /dev/null +++ b/.github/workflows/version-bump.yml @@ -0,0 +1,17 @@ +name: Version Bump + +permissions: + contents: write + +on: + pull_request: + types: [closed] + branches: [main, 'release/**', 'feature/**'] + +jobs: + bump: + if: github.event.pull_request.merged == true + uses: Aignosi/github_workflow_templates/.github/workflows/reusable-version-bump.yml@main + with: + update_version_in: '["pyproject"]' + secrets: inherit