diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml index d2cf4552..63d668c9 100644 --- a/.github/workflows/deploy-staging.yml +++ b/.github/workflows/deploy-staging.yml @@ -1,4 +1,4 @@ -name: Deploy staging +name: Deploy staging content on: workflow_dispatch: {} @@ -13,7 +13,7 @@ concurrency: jobs: deploy: - name: Deploy to staging + name: Publish content to staging # Deploy only the exact staging branch ref, never a tag or other ref # (workflow_dispatch can be invoked from arbitrary refs). if: github.ref == 'refs/heads/staging' @@ -34,20 +34,6 @@ jobs: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: fetch-depth: 0 - - name: Resolve governance comparison ref - id: governance-ref - shell: bash - env: - EVENT_NAME: ${{ github.event_name }} - EVENT_BEFORE: ${{ github.event.before }} - run: | - set -euo pipefail - if [[ "${EVENT_NAME}" == "push" && -n "${EVENT_BEFORE}" && ! "${EVENT_BEFORE}" =~ ^0+$ ]]; then - base="${EVENT_BEFORE}" - else - base="origin/dev" - fi - printf 'base=%s\n' "${base}" >> "${GITHUB_OUTPUT}" - name: Set up Terraform uses: hashicorp/setup-terraform@dfe3c3f87815947d99a8997f908cb6525fc44e9e # v4.0.1 with: @@ -61,7 +47,7 @@ jobs: - name: Quality gates (full verify before any deploy) run: npm ci && npm run verify env: - GOVERNANCE_BASE: ${{ steps.governance-ref.outputs.base }} + GOVERNANCE_BASE: origin/dev - name: Assume staging deploy role (OIDC) uses: aws-actions/configure-aws-credentials@e6de054238d6b7531b4efff3b6587d9aade6a06c # v6.2.3 diff --git a/.github/workflows/deploy-tf-poc.yml b/.github/workflows/deploy-tf-poc.yml index 33bc3a6b..3a50331b 100644 --- a/.github/workflows/deploy-tf-poc.yml +++ b/.github/workflows/deploy-tf-poc.yml @@ -1,4 +1,4 @@ -name: Deploy Terraform POC +name: Deploy tf-poc content on: workflow_dispatch: {} @@ -13,7 +13,7 @@ concurrency: jobs: deploy: - name: Deploy to tf-poc + name: Publish content to tf-poc if: github.ref == 'refs/heads/feature/terraform-cd-poc' runs-on: ubuntu-latest environment: tf-poc diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index bd0eceb6..58126309 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,4 +1,4 @@ -name: Deploy +name: Deploy dev content on: workflow_dispatch: {} @@ -13,7 +13,7 @@ concurrency: jobs: deploy: - name: Deploy to dev + name: Publish content to dev if: github.ref == 'refs/heads/dev' runs-on: ubuntu-latest env: