diff --git a/.gitea/workflows/build_test.yaml b/.gitea/workflows/build_test.yaml index 4233359..b959ef6 100644 --- a/.gitea/workflows/build_test.yaml +++ b/.gitea/workflows/build_test.yaml @@ -3,7 +3,6 @@ run-name: ${{ gitea.actor }} on: push: branches: - - main - pre-prod pull_request: diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index dfebd0a..6f925f9 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -2,14 +2,13 @@ name: Deploy to production run-name: deploy-${{ gitea.actor }} on: - merge: + push: branches: - main jobs: deploy: runs-on: ubuntu-latest - needs: tests # require tests to pass steps: - uses: actions/checkout@v3 @@ -24,7 +23,7 @@ jobs: - name: Deploy run: | ssh -i ~/.ssh/id_rsa ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }} << 'EOF' - cd /path/to/Quatsh-Website + cd ~/Quatsh-Website echo "Pulling latest code..." git pull origin main diff --git a/Makefile b/Makefile index bf5d0ae..4e2289a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ prod: docker compose down - docker compose -f ./compose.yaml -f ./compose.prod.yaml up --build + docker compose -f ./compose.yaml -f ./compose.prod.yaml up -d --build dev: docker compose down