diff --git a/.github/issue-branch.yml b/.github/issue-branch.yml deleted file mode 100644 index 6fd8ad1..0000000 --- a/.github/issue-branch.yml +++ /dev/null @@ -1,10 +0,0 @@ -branchName: '${issue.number}-${issue.title}' -branches: - - label: bug - prefix: fix/ - - label: enhancement - prefix: feature/ - - label: chore - prefix: chore/ - - label: '*' - prefix: other/ diff --git a/.github/workflows/ci.yml b/.github/workflows/cicd.yml similarity index 70% rename from .github/workflows/ci.yml rename to .github/workflows/cicd.yml index 1678d1a..20fe84a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/cicd.yml @@ -60,3 +60,24 @@ jobs: files: ./src/coverage.xml fail_ci_if_error: true verbose: true + deploy: + name: Deploy to server + runs-on: ubuntu-latest + needs: quality-assurance + if: success() && github.ref == 'refs/heads/productiont' + + steps: + - name: Deploy via SSH + uses: appleboy/ssh-action@v1.2.4 + with: + host: ${{ secrets.PROD_HOST }} + username: ${{ secrets.PROD_USER }} + key: ${{ secrets.PROD_SSH_KEY }} + port: 22 + script: | + cd /home/ideologicalatlas/notifications + git fetch --all + git reset --hard origin/productiont + printf "%s" "${{ secrets.ENV_FILE }}" > .env + docker compose up -d --build --remove-orphans + docker image prune -f diff --git a/.github/workflows/create-branch.yml b/.github/workflows/create-branch.yml deleted file mode 100644 index bff747d..0000000 --- a/.github/workflows/create-branch.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: Create Issue Branch -on: - issues: - types: [assigned] - -jobs: - create_branch: - runs-on: ubuntu-latest - steps: - - name: Create Issue Branch - uses: robvanderleek/create-issue-branch-action@v3 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index 525e7d6..44c5aab 100644 --- a/.gitignore +++ b/.gitignore @@ -136,6 +136,7 @@ celerybeat.pid # Environments .env +.env-prod .envrc .venv env/ diff --git a/compose.yml b/compose.yml index 2839385..5624be4 100644 --- a/compose.yml +++ b/compose.yml @@ -16,3 +16,10 @@ services: options: max-size: 50m max-file: "2" + networks: + - global_net + +networks: + global_net: + name: ideological_global_network + external: true diff --git a/src/templates/base.html b/src/templates/base.html index a937cac..ed43372 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -30,7 +30,7 @@
|
- |