Update deployment workflows and Docker Compose configurations for cloud-pc, mini-pc, and ru-vps services to specify correct runner labels and improve deployment processes.

.gitea/workflows/deploy-cloud-pc.yml

@@ -7,19 +7,19 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-latest
+    runs-on: cloud-pc
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 2
       - name: Deploy changed stacks
         run: |
-          ssh -o StrictHostKeyChecking=no ${{ secrets.CLOUD-PC_USER }}@${{ secrets.CLOUD-PC_HOST }} << 'ENDSSH'
           cd /opt/services
           git pull
           for dir in $(git diff --name-only HEAD~1 HEAD | grep '^cloud-pc/' | cut -d/ -f2 | sort -u); do
             echo "==> Deploying $dir"
             cd /opt/services/cloud-pc/$dir
+            test -f docker-compose.yml || { echo "No docker-compose.yml in $dir, skipping"; cd /opt/services; continue; }
             if grep -qE '^[[:space:]]*build:' docker-compose.yml; then
               docker compose up -d --build --remove-orphans
             else
@@ -28,4 +28,3 @@ jobs:
             fi
             cd /opt/services
           done
-          ENDSSH

.gitea/workflows/deploy-mini-pc.yml

@@ -7,19 +7,19 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-latest
+    runs-on: mini-pc
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 2
       - name: Deploy changed stacks
         run: |
-          ssh -o StrictHostKeyChecking=no ${{ secrets.MINI-PC_USER }}@${{ secrets.MINI-PC_HOST }} << 'ENDSSH'
           cd /opt/services
           git pull
           for dir in $(git diff --name-only HEAD~1 HEAD | grep '^mini-pc/' | cut -d/ -f2 | sort -u); do
             echo "==> Deploying $dir"
             cd /opt/services/mini-pc/$dir
+            test -f docker-compose.yml || { echo "No docker-compose.yml in $dir, skipping"; cd /opt/services; continue; }
             if grep -qE '^[[:space:]]*build:' docker-compose.yml; then
               docker compose up -d --build --remove-orphans
             else
@@ -28,4 +28,3 @@ jobs:
             fi
             cd /opt/services
           done
-          ENDSSH

.gitea/workflows/deploy-ru-vps.yml

@@ -7,19 +7,19 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-latest
+    runs-on: ru-vps
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 2
       - name: Deploy changed stacks
         run: |
-          ssh -o StrictHostKeyChecking=no ${{ secrets.RU-VPS_USER }}@${{ secrets.RU-VPS_HOST }} << 'ENDSSH'
           cd /opt/services
           git pull
           for dir in $(git diff --name-only HEAD~1 HEAD | grep '^ru-vps/' | cut -d/ -f2 | sort -u); do
             echo "==> Deploying $dir"
             cd /opt/services/ru-vps/$dir
+            test -f docker-compose.yml || { echo "No docker-compose.yml in $dir, skipping"; cd /opt/services; continue; }
             if grep -qE '^[[:space:]]*build:' docker-compose.yml; then
               docker compose up -d --build --remove-orphans
             else
@@ -28,4 +28,3 @@ jobs:
             fi
             cd /opt/services
           done
-          ENDSSH

cloud-pc/gitea-runner/docker-compose.yml

@@ -9,3 +9,4 @@ services:
       GITEA_INSTANCE_URL: https://git.ada-dev.ru
       GITEA_RUNNER_REGISTRATION_TOKEN: ${TOKEN}
       GITEA_RUNNER_NAME: cloud-pc-runner
+      GITEA_RUNNER_LABELS: cloud-pc

mini-pc/gitea-runner/docker-compose.yml

@@ -9,3 +9,4 @@ services:
       GITEA_INSTANCE_URL: https://git.ada-dev.ru
       GITEA_RUNNER_REGISTRATION_TOKEN: ${TOKEN}
       GITEA_RUNNER_NAME: mini-pc-runner
+      GITEA_RUNNER_LABELS: mini-pc

ru-vps/gitea-runner/docker-compose.yml

@@ -9,3 +9,4 @@ services:
       GITEA_INSTANCE_URL: https://git.ada-dev.ru
       GITEA_RUNNER_REGISTRATION_TOKEN: ${TOKEN}
       GITEA_RUNNER_NAME: ru-vps-runner
+      GITEA_RUNNER_LABELS: ru-vps