Skip to content

Commit

Permalink
Merge pull request #83 from amplication/main
Browse files Browse the repository at this point in the history
chore: merge main into staging to also trigger on staging branch
  • Loading branch information
levivannoort authored Dec 20, 2023
2 parents b97cddd + b6d6675 commit a0e95b4
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ name: continuous-integration
on:
workflow_dispatch:
push:
branches: [main]
branches:
- main
- staging
release:
types: [published]

Expand Down Expand Up @@ -41,6 +43,9 @@ jobs:
- id: environment-identifier
run: |
if [[ "${{ github.ref_name }}" == "${{ github.event.repository.default_branch }}" ]];
then
echo environment="staging" >> $GITHUB_OUTPUT
elif [[ "${{ github.ref_name }}" == "staging" ]];
then
echo environment="staging" >> $GITHUB_OUTPUT
elif [[ "${{ github.ref_type }}" == "tag" ]];
Expand Down

0 comments on commit a0e95b4

Please sign in to comment.