Skip to content

Commit

Permalink
Merge branch 'CD-update-CODEOWNERS' of github.com:cisagov/XFD into CD…
Browse files Browse the repository at this point in the history
…-update-CODEOWNERS
  • Loading branch information
Matthew-Grayson committed Mar 5, 2024
2 parents 4bae923 + c35b02f commit 597326a
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ name: Backend Pipeline
on:
push:
branches:
- master
- develop
- production
paths:
- 'backend/**'
- '.github/workflows/backend.yml'
pull_request:
branches:
- master
- develop
- production
paths:
- 'backend/**'
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
runs-on: ubuntu-latest
environment: staging
concurrency: 1
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
if: github.event_name == 'push' && github.ref == 'refs/heads/develop'
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: "CodeQL"

on:
push:
branches: [ "master", "production" ]
branches: [ "develop", "production" ]

Check failure on line 5 in .github/workflows/codeql.yml

View workflow job for this annotation

GitHub Actions / lint

5:16 [brackets] too many spaces inside brackets

Check failure on line 5 in .github/workflows/codeql.yml

View workflow job for this annotation

GitHub Actions / lint

5:40 [brackets] too many spaces inside brackets

Check failure on line 5 in .github/workflows/codeql.yml

View workflow job for this annotation

GitHub Actions / lint

5:16 [brackets] too many spaces inside brackets

Check failure on line 5 in .github/workflows/codeql.yml

View workflow job for this annotation

GitHub Actions / lint

5:40 [brackets] too many spaces inside brackets
pull_request:
branches: [ "master" ]
branches: [ "develop" ]

Check failure on line 7 in .github/workflows/codeql.yml

View workflow job for this annotation

GitHub Actions / lint

7:16 [brackets] too many spaces inside brackets

Check failure on line 7 in .github/workflows/codeql.yml

View workflow job for this annotation

GitHub Actions / lint

7:26 [brackets] too many spaces inside brackets

Check failure on line 7 in .github/workflows/codeql.yml

View workflow job for this annotation

GitHub Actions / lint

7:16 [brackets] too many spaces inside brackets

Check failure on line 7 in .github/workflows/codeql.yml

View workflow job for this annotation

GitHub Actions / lint

7:26 [brackets] too many spaces inside brackets
schedule:
- cron: "23 17 * * 6"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ name: Docs
on:
push:
branches:
- master
- develop
paths:
- 'docs/**'
- 'backend/**'
- '.github/workflows/docs.yml'
pull_request:
branches:
- master
- develop
paths:
- 'docs/**'
- 'backend/**'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ name: Frontend Pipeline
on:
push:
branches:
- master
- develop
- production
paths:
- 'frontend/**'
- '.github/workflows/frontend.yml'
pull_request:
branches:
- master
- develop
- production
paths:
- 'frontend/**'
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
runs-on: ubuntu-latest
environment: staging
concurrency: 1
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
if: github.event_name == 'push' && github.ref == 'refs/heads/develop'
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/infrastructure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ name: Infrastructure Pipeline
on:
push:
branches:
- master
- develop
- production
paths:
- 'infrastructure/**'
- '.github/workflows/infrastructure.yml'
pull_request:
branches:
- master
- develop
- production
paths:
- 'infrastructure/**'
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

- name: Terraform apply
if: github.ref == 'refs/heads/master'
if: github.ref == 'refs/heads/develop'
run: terraform apply stage.plan
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
Expand Down

0 comments on commit 597326a

Please sign in to comment.