Merge branch 'develop' of https://git.sidorychev.ru/nerv/frontend into develop

2026-05-03 08:56:50 +03:00
parent d9aa2896c1 657288ecd0
commit 641374fc94
1 changed files with 8 additions and 0 deletions
@@ -17,7 +17,15 @@ jobs:
  build:
    # Проверяем, что job запустился или при мерже пулл-реквеста, или на событии релиза, или вручную
    if: ${{ github.event_name == 'release' || github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }}
+<<<<<<< HEAD
    runs-on: RUNNER
+=======
+<<<<<<< HEAD
+    runs-on: RUNNER
+=======
+    runs-on: self-hosted
+>>>>>>> c263eeadf566bca0625a7ef8c3b3a1a771496d2f
+>>>>>>> 657288ecd0c0dcb2c59c37ef29007c94c17f6a9f
    steps:
      - name: Clone repository
        uses: actions/checkout@v4