Skip to content
This repository was archived by the owner on Sep 1, 2022. It is now read-only.

update staging-test with master #14

Merged
merged 1 commit into from
Nov 12, 2019
Merged

update staging-test with master #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,11 @@ steps:
- type: mergeBranch
head: aws-configuration
base: master

# merge master into staging-test so staging-test has the appropriate updates
- type: mergeBranch
head: master
base: staging-test

# we must prepare next pr now so we can point to it. We ask the user to test this action by adding a label
- type: createPullRequest
Expand Down