Skip to content

Commit

Permalink
Merge pull request #2808 from ttys0dev/fix-deploy
Browse files Browse the repository at this point in the history
Deploy on push to main instead of pull request close
  • Loading branch information
mlissner authored Jun 8, 2023
2 parents c179897 + a662def commit 3a00d08
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/docker-build-dev.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
name: Push new dev images
on:
pull_request:
push:
branches: [ "main" ]
types:
- closed

jobs:
build:
# Build only merged PRs
if: (github.event_name == 'pull_request' && github.event.pull_request.merged == true)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
name: Automate build and deploy
on:
pull_request:
push:
branches: [ "main" ]
types:
- closed

env:
AWS_REGION: us-west-2
Expand All @@ -13,7 +11,6 @@ env:
jobs:
build:
# Build only merged PRs
if: (github.event_name == 'pull_request' && github.event.pull_request.merged == true)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down

0 comments on commit 3a00d08

Please sign in to comment.