Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update more deploy scripts #4

Merged
merged 2 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Deploy to Production

on:
push:
branches:
- main
pull_request:
types:
- closed
Expand All @@ -12,6 +9,7 @@ on:

jobs:
build_and_test:
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main'
name: Build and test
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -69,6 +67,7 @@ jobs:
name: Deploy to Production
if: github.event.pull_request.merged == true || github.event_name == 'push'
runs-on: ubuntu-latest
needs: build_and_push
steps:
- name: Run compose script in Deployment repository.
uses: benc-uk/workflow-dispatch@v1
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
with:
token: ${{ secrets.SHARED_PAT }}
submodules: recursive
ref: ${{ github.event.pull_request.head.sha }}

- name: Build and start services
run: |
Expand Down
Loading