From 3c92a0371f2df92ccfbd20d059e4d6b8425c3b6f Mon Sep 17 00:00:00 2001 From: Xor290 Date: Sun, 14 Jun 2026 17:49:58 +0200 Subject: [PATCH] chore: update CI --- .github/workflows/backend-build.yml | 4 ++-- .github/workflows/frontend-web-build.yml | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/backend-build.yml b/.github/workflows/backend-build.yml index f83b4674..87ded0b2 100644 --- a/.github/workflows/backend-build.yml +++ b/.github/workflows/backend-build.yml @@ -124,5 +124,5 @@ jobs: username: ${{ secrets.SERVER_USER }} key: ${{ (github.ref == 'refs/heads/main' || github.base_ref == 'main') && secrets.SERVER_SSH_KEY_PROD || secrets.SERVER_SSH_KEY_PRE_PROD }} script: | - docker compose -f ${{ secrets.COMPOSE_PATH }} pull backend waf - docker compose -f ${{ secrets.COMPOSE_PATH }} up -d --no-deps backend waf + docker compose -f ${{ (github.ref == 'refs/heads/main' || github.base_ref == 'main') && secrets.COMPOSE_PATH_PROD || secrets.COMPOSE_PATH_PRE_PROD }} pull backend waf + docker compose -f ${{ (github.ref == 'refs/heads/main' || github.base_ref == 'main') && secrets.COMPOSE_PATH_PROD || secrets.COMPOSE_PATH_PRE_PROD }} up -d --no-deps backend waf diff --git a/.github/workflows/frontend-web-build.yml b/.github/workflows/frontend-web-build.yml index 26d1172e..ea9e7889 100644 --- a/.github/workflows/frontend-web-build.yml +++ b/.github/workflows/frontend-web-build.yml @@ -5,12 +5,10 @@ on: branches: [main, pre-prod] paths: - "frontend-prep/**" - - "docker/frontend/**" pull_request: branches: [main, pre-prod] paths: - "frontend-prep/**" - - "docker/frontend/**" jobs: lint-typecheck: @@ -98,6 +96,7 @@ jobs: name: Deploy to server needs: docker runs-on: ubuntu-latest + if: github.event_name == 'push' steps: - name: SSH deploy @@ -107,5 +106,5 @@ jobs: username: ${{ secrets.SERVER_USER }} key: ${{ (github.ref == 'refs/heads/main' || github.base_ref == 'main') && secrets.SERVER_SSH_KEY_PROD || secrets.SERVER_SSH_KEY_PRE_PROD }} script: | - docker compose -f ${{ secrets.COMPOSE_PATH }} pull frontend - docker compose -f ${{ secrets.COMPOSE_PATH }} up -d --no-deps frontend + docker compose -f ${{ (github.ref == 'refs/heads/main' || github.base_ref == 'main') && secrets.COMPOSE_PATH_PROD || secrets.COMPOSE_PATH_PRE_PROD }} pull frontend + docker compose -f ${{ (github.ref == 'refs/heads/main' || github.base_ref == 'main') && secrets.COMPOSE_PATH_PROD || secrets.COMPOSE_PATH_PRE_PROD }} up -d --no-deps frontend