merged with main and resolved conflict

This commit is contained in:
Alysia Broddrick 2023-06-13 10:50:39 -07:00
commit 36ca6b1611
No known key found for this signature in database
GPG key ID: 03917052CD0F06B7
17 changed files with 305 additions and 7 deletions

View file

@ -18,6 +18,7 @@ jobs:
|| startsWith(github.head_ref, 'bl/')
|| startsWith(github.head_ref, 'rjm/')
|| startsWith(github.head_ref, 'rb/')
|| startsWith(github.head_ref, 'ko/')
outputs:
environment: ${{ steps.var.outputs.environment}}
runs-on: "ubuntu-latest"

View file

@ -15,6 +15,7 @@ on:
options:
- stable
- rb
- ko
- ab
- bl
- rjm

View file

@ -16,6 +16,7 @@ on:
options:
- stable
- rb
- ko
- ab
- bl
- rjm