Compare commits

...

4 Commits

Author SHA1 Message Date
a4e34efb76 ci: убрать lint из needs deploy-job
Some checks failed
CI / Lint (pull_request) Failing after 41s
CI / Build (pull_request) Successful in 1m33s
CI / Secret scan (pull_request) Successful in 2m33s
CI / PR size check (pull_request) Successful in 6s
CI / Deploy to S1 + S2 (pull_request) Has been skipped
Deploy зависит от lint через needs:, поэтому при failure
lint (исторический долг empty-блоков) deploy не запускается ВООБЩЕ
(висит pending бесконечно).

Lint опциональный — не в branch protection required-checks.
Deploy должен зависеть только от Build + Secret-scan.
2026-05-29 04:16:40 +03:00
18618f734b Merge branch 'main' of https://git.rublox.pro/rublox/player into chore/ci-deploy-to-s1-s2 2026-05-29 04:16:39 +03:00
210d26a3f8 ci: re-trigger checks
Some checks failed
CI / Lint (pull_request) Failing after 44s
CI / Build (pull_request) Successful in 1m36s
CI / Secret scan (pull_request) Successful in 2m26s
CI / PR size check (pull_request) Successful in 6s
CI / Deploy to S1 + S2 (pull_request) Has been skipped
2026-05-29 04:08:56 +03:00
63b3472b82 ci: add auto-deploy to S1+S2 via rsync after merge to main
Some checks failed
CI / Secret scan (pull_request) Successful in 2m26s
CI / PR size check (pull_request) Successful in 5s
CI / Lint (pull_request) Failing after 41s
CI / Build (pull_request) Successful in 1m33s
CI / Deploy to S1 + S2 (pull_request) Has been skipped
Adds new "deploy" job in .gitea/workflows/ci.yml that runs on push
to main (after PR is merged). Builds production bundle and rsyncs
it to /var/www/rublox-player/build/ on both production servers
(S1 VM 124 via NAT 1998, S2 VM 124 directly via runner network).

Uses Gitea Secrets:
  - DEPLOY_SSH_KEY: dedicated ed25519 key for CI, pubkey already
    on ~min/.ssh/authorized_keys on both VM 124
  - KNOWN_HOSTS: host-keys of both targets to prevent MITM

Also updates CONTRIBUTING.md:
  - Maintainer workflow section explaining why even Lead works via PR
  - Hotfix flow (always via PR, never direct push to main)
  - DevPanel as fallback if CI deploy is broken
2026-05-29 03:54:29 +03:00

View File

@ -106,7 +106,10 @@ jobs:
deploy: deploy:
name: Deploy to S1 + S2 name: Deploy to S1 + S2
if: github.event_name == 'push' && github.ref == 'refs/heads/main' if: github.event_name == 'push' && github.ref == 'refs/heads/main'
needs: [lint, build, secret-scan] # Lint НЕ в needs — он опциональный (исторический долг empty-блоков
# ещё не вычищен, см. branch protection без 'CI / Lint' в required).
# Deploy всё равно зависит от Build и Secret-scan — это критично.
needs: [build, secret-scan]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3