mirror of
https://github.com/Sea-Haven-Industries/seahaven-site.git
synced 2026-10-03 15:03:15 +00:00
ci: drop the legacy ci job (#74)
The second ci-static call existed to emit ci / ci and cancelled the real static run. ci-complete is the remaining gate.
This commit is contained in:
parent
6cf47bd533
commit
88658139ef
1 changed files with 3 additions and 16 deletions
19
.github/workflows/ci.yaml
vendored
19
.github/workflows/ci.yaml
vendored
|
|
@ -1,8 +1,7 @@
|
|||
name: CI
|
||||
|
||||
# Parallel static-site and Terraform portions. ci-complete is the check the
|
||||
# CI complete ruleset requires. The ci job remains so main branch protection
|
||||
# still sees ci / ci until this repo is moved onto that ruleset.
|
||||
# CI complete ruleset requires.
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
|
|
@ -24,7 +23,7 @@ jobs:
|
|||
with:
|
||||
presets: terraform
|
||||
|
||||
ci:
|
||||
static:
|
||||
needs: autofix
|
||||
if: always() && !cancelled() && (needs.autofix.result == 'skipped' || needs.autofix.outputs.committed != 'true')
|
||||
uses: Sea-Haven-Industries/.github/.github/workflows/ci-static.yaml@0a1010e63248c9ca9f042c870eb2c579ba6b9455 # v1.0.19
|
||||
|
|
@ -32,16 +31,6 @@ jobs:
|
|||
build-command: "npx @11ty/eleventy"
|
||||
check-dir: "_site"
|
||||
|
||||
# ci-static cancels other in-progress runs of this workflow on the same ref.
|
||||
# Run after the legacy ci job so both calls can finish.
|
||||
static:
|
||||
needs: [autofix, ci]
|
||||
if: always() && !cancelled() && needs.ci.result == 'success' && (needs.autofix.result == 'skipped' || needs.autofix.outputs.committed != 'true')
|
||||
uses: Sea-Haven-Industries/.github/.github/workflows/ci-static.yaml@0a1010e63248c9ca9f042c870eb2c579ba6b9455 # v1.0.19
|
||||
with:
|
||||
build-command: "npx @11ty/eleventy"
|
||||
check-dir: "_site"
|
||||
|
||||
terraform:
|
||||
needs: autofix
|
||||
if: always() && !cancelled() && (needs.autofix.result == 'skipped' || needs.autofix.outputs.committed != 'true')
|
||||
|
|
@ -51,7 +40,7 @@ jobs:
|
|||
|
||||
ci-complete:
|
||||
name: ci-complete
|
||||
needs: [autofix, ci, static, terraform]
|
||||
needs: [autofix, static, terraform]
|
||||
if: always() && !cancelled() && (needs.autofix.result == 'skipped' || needs.autofix.outputs.committed != 'true')
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 5
|
||||
|
|
@ -59,12 +48,10 @@ jobs:
|
|||
- name: Require portions
|
||||
env:
|
||||
AUTOFIX: ${{ needs.autofix.result }}
|
||||
CI: ${{ needs.ci.result }}
|
||||
STATIC: ${{ needs.static.result }}
|
||||
TERRAFORM: ${{ needs.terraform.result }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
test "${AUTOFIX}" = success -o "${AUTOFIX}" = skipped
|
||||
test "${CI}" = success
|
||||
test "${STATIC}" = success
|
||||
test "${TERRAFORM}" = success
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue