Skip to content
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
6 changes: 2 additions & 4 deletions .github/workflows/spring-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ name: Deploy on PR Merged to develop

on:
pull_request:
branches:
- develop
types:
- closed
types: [closed]
branches: [develop]

jobs:
build:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/spring-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: Spring CI
on:
push:
branches: [ "develop" ]
pull_request:
branches: [ "develop" ]

jobs:
build:
Expand Down
4 changes: 3 additions & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ services:
- web-net
ports:
- 8080:8080

postgres:
image: postgres:15
container_name: my_postgres
restart: always
networks:
- web-net
ports:
Expand All @@ -30,4 +32,4 @@ services:

networks:
web-net:
external: true
driver: bridge
Loading