merged main and resolved conflict

This commit is contained in:
Alysia Broddrick 2024-06-11 13:07:21 -07:00
commit 1c1ae51023
No known key found for this signature in database
GPG key ID: 03917052CD0F06B7
14 changed files with 461 additions and 110 deletions

View file

@ -25,6 +25,9 @@ jobs:
|| startsWith(github.head_ref, 'meoward/')
|| startsWith(github.head_ref, 'bob/')
|| startsWith(github.head_ref, 'cb/')
|| startsWith(github.head_ref, 'hotgov/')
|| startsWith(github.head_ref, 'litterbox/')
|| startsWith(github.head_ref, 'ag/')
outputs:
environment: ${{ steps.var.outputs.environment}}
runs-on: "ubuntu-latest"

View file

@ -17,6 +17,8 @@ on:
- staging
- development
- ag
- litterbox
- hotgov
- cb
- bob
- meoward

View file

@ -17,6 +17,8 @@ on:
- staging
- development
- ag
- litterbox
- hotgov
- cb
- bob
- meoward