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.

Sign up for GitHub

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

Merge GA workflows into one #53

Merged
merged 2 commits into from
Jan 30, 2025
Merged

Merge GA workflows into one #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e85710
Merge GA workflows into one
andreyponomarevru Jan 30, 2025
5d524f3
Update
andreyponomarevru Jan 30, 2025
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
23 changes: 23 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ on:
branches: [main]
push:
branches: [main]
# This allows you to trigger the execution of this Workflow file manually
workflow_dispatch:
# To trigget this event you should tag the commit using Git tags > push it to the repo > manually create a new Release in the repo using this tag via GitHub UI.
release:
types:
- created

# This block should be the same in all Workflow .yml files
env:
Expand Down Expand Up @@ -63,3 +68,21 @@ jobs:
# - uses: actions/checkout@v4
# - run: ./ci-cd/set-up-env-vars.sh
# - run: ./ci-cd/run-e2e-api-tests.sh

build_and_push_to_docker_hub:
runs-on: ubuntu-latest
needs: [process_code, run_unit_tests]

steps:
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ vars.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- uses: actions/checkout@v4
- run: ./ci-cd/set-up-env-vars.sh
- run: ./ci-cd/build-and-push-to-dockerhub.sh

# TODO
# deploy_to_vps:
37 changes: 0 additions & 37 deletions .github/workflows/release.yml
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions docker-compose.prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
services:
api-prod:
container_name: api-prod
image: ponomarevandrey/livestreamer-backend_api-prod:latest
image: "ponomarevandrey/livestreamer-backend_api-prod:latest"
# Uncomment 'build' to build the image for the first-time deployment (i.e.
# to upload to Docker Hub) or if you want to run prod env on local machine
# instead of VPS
Expand Down Expand Up @@ -32,7 +32,7 @@ services:

postgres-prod:
container_name: postgres-prod
image: ponomarevandrey/livestreamer-backend_postgres-prod:latest
image: "ponomarevandrey/livestreamer-backend_postgres-prod:latest"
# Uncomment to build the image for the first-time deployment (i.e. to
# upload to Docker Hub) or if you want to run prod env on local machine
# instead of VPS
Expand All @@ -51,7 +51,7 @@ services:
- 127.0.0.1:5432:5432

redis-prod:
image: ponomarevandrey/livestreamer-backend_redis-prod:latest
image: "ponomarevandrey/livestreamer-backend_redis-prod:latest"
container_name: redis-prod
# Uncomment to build the image for the first-time deployment (i.e. to
# upload to Docker Hub) or if you want to run prod env on local machine
Expand Down