diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 7939c2d..8936138 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -1,38 +1,30 @@ +--- name: Deploy to production run-name: deploy-${{ gitea.actor }} - on: push: - branches: - - main - + branches: [main] jobs: deploy: runs-on: ubuntu-latest - steps: - uses: actions/checkout@v3 - - name: Setup SSH run: | mkdir -p ~/.ssh echo "${{ secrets.SSH_KEY }}" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa ssh-keyscan -H ${{ secrets.DEPLOY_HOST }} >> ~/.ssh/known_hosts - - name: Deploy - run: | + run: |- ssh -i ~/.ssh/id_rsa ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }} << 'EOF' cd ~/Quatsh-Website - echo "Pulling latest code..." git pull origin main - echo "Building containers..." make prod - echo "Running Django deploy check" docker compose run --rm web python manage.py check --deploy - echo "Deployment complete." - EOF \ No newline at end of file + EOF + diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 92c16c0..26b77a7 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -1,18 +1,16 @@ +--- name: Gitea Test. run-name: ${{ gitea.actor }} on: push: - branches: - - main - - pre-prod + branches: [main, pre-prod] pull_request: - jobs: tests: runs-on: ubuntu-latest - steps: - uses: actions/checkout@v3 - + - name: lint + run: make lint - name: test - run: make test \ No newline at end of file + run: make test