Merge pull request 'fix-again' (#54) from fix-again into main

Reviewed-on: #54

.gitea/actions/k8s/action.yaml

@@ -45,7 +45,7 @@ runs:
     uses: clowdhaus/argo-cd-action/@main
     with:
       version: 3.1.3
-      command: app sync ${{ inputs.environment }} --resource 'apps:Deployment:*'
+      command: app sync ${{ inputs.environment }} --resource apps:Deployment:${{ github.event.repository.name }}*
   - name: Refresh secret
     uses: clowdhaus/argo-cd-action/@main
     with:

.gitea/actions/vk-notify/action.yaml

@@ -36,35 +36,25 @@ runs:
           *) echo "ICON=ℹ️" >> $GITHUB_ENV ;;
         esac
 
-    - name: Notify VK Teams
-      uses: dosymep/vk-teams-action@v1.0.0
-      with:
-        token: ${{ env.token }}
-        to: ${{ env.to }}
-        format: MarkdownV2
-        message: |
-          *${{ github.repository }}* \- \[${{ inputs.name }}\]\(${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_number }}\) \
-          was *${{ inputs.result }}* by ${{ github.event.sender.login }} ${{ env.ICON }}
-
-    - name: Wait a bit (ensure send completes)
+    - name: Notify VK Teams (native)
       if: always()
       shell: bash
+      continue-on-error: true
       run: |
-        echo "[DEBUG] Starting sleep to ensure message delivery..."
-        date
-        sleep 5
-        echo "[DEBUG] Finished sleep, message should have been delivered."
-        date
+        echo "[DEBUG] Sending VK Teams notification..."
+        curl -G "https://myteam.mail.ru/bot/v1/messages/sendText" \
+          --data-urlencode "token=${{ env.token }}" \
+          --data-urlencode "chatId=${{ env.to }}" \
+          --data-urlencode "parseMode=MarkdownV2" \
+          --data-urlencode "text=*${{ github.repository }}* - [${{ inputs.name }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_number }}) was *${{ inputs.result }}* by ${{ github.event.sender.login }} ${{ env.ICON }}"
 
-    - name: Force wait for container cleanup
-      if: always()
-      shell: bash
-      run: |
-        echo "[DEBUG] Waiting for runner cleanup barrier..."
-        # пока Docker демон удаляет контейнер, удерживаем процесс активным
-        for i in {1..5}; do
-          docker ps -a | grep act || break
-          echo "[DEBUG] Runner still cleaning up... $i"
-          sleep 1
-        done
-        echo "[DEBUG] Cleanup done."
+        CODE=$?
+        if [ $CODE -ne 0 ]; then
+          echo "[WARN] VK Teams notification failed with exit code $CODE"
+        else
+          echo "[INFO] VK Teams notification sent successfully"
+        fi
+
+        # Делаем паузу, чтобы убедиться, что сообщение дошло
+        echo "[DEBUG] Sleeping 5s to ensure delivery..."
+        sleep 5

.github/workflows/build.yaml

@@ -11,6 +11,9 @@ on:
       force_build:
         type: boolean
         default: false
+      arch:
+        type: string
+        default: "linux/amd64,linux/arm64/v8"
     secrets:
       VK_TEAMS_BOT_TOKEN:
         required: true
@@ -69,9 +72,10 @@ jobs:
       - name: Restore Docker layer cache
         uses: actions/cache/restore@v4
         with:
-          path: /cache/buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          path: /cache/${{ github.repository }}/buildx-cache
+          key: ${{ runner.os }}-${{ github.repository }}-buildx-${{ hashFiles(format('{0}/Dockerfile', github.workspace), format('{0}/**/requirements.txt', github.workspace), format('{0}/**/*lock*', github.workspace), format('{0}/**/package-lock.json', github.workspace), format('{0}/**/poetry.lock', github.workspace)) }}
           restore-keys: |
+            ${{ runner.os }}-${{ github.repository }}-buildx-
             ${{ runner.os }}-buildx-
 
       - name: Build and push multi-arch image
@@ -84,28 +88,34 @@ jobs:
           tags: |
             cr.yandex/${{ env.CR_REGISTRY }}/${{ env.CR_REPO }}:${{ env.SHORT_SHA }}
             cr.yandex/${{ env.CR_REGISTRY }}/${{ env.CR_REPO }}:${{ env.SAFE_TAG }}
-          platforms: linux/amd64,linux/arm64/v8
+          platforms: ${{ inputs.arch }}
           ssh: default
           no-cache: ${{ inputs.force_build }}
           build-args: |
             GIT_COMMIT=${{ github.sha }}
           cache-from: |
-            type=local,src=/cache/buildx-cache
+            type=local,src=/cache/${{ github.repository }}/buildx-cache
           cache-to: |
-            type=local,dest=/cache/buildx-cache-new,mode=max
+            type=local,dest=/cache/${{ github.repository }}/buildx-cache-new,mode=max
 
-      - name: Move new cache
+      - name: Move new cache if it exists
         if: always()
         run: |
-          rm -rf /cache/buildx-cache
-          mv /cache/buildx-cache-new /cache/buildx-cache
+          mkdir -p /cache/${{ github.repository }}
+          if [ -d /cache/${{ github.repository }}/buildx-cache-new ]; then
+            echo "Found new buildx cache, replacing old one..."
+            rm -rf /cache/${{ github.repository }}/buildx-cache
+            mv /cache/${{ github.repository }}/buildx-cache-new /cache/${{ github.repository }}/buildx-cache
+          else
+            echo "No new buildx cache found, keeping old one."
+          fi
 
       - name: Save Docker layer cache
         if: always()
         uses: actions/cache/save@v4
         with:
-          path: /cache/buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          path: /cache/${{ github.repository }}/buildx-cache
+          key: ${{ runner.os }}-${{ github.repository }}-buildx-${{ hashFiles(format('{0}/Dockerfile', github.workspace), format('{0}/**/requirements.txt', github.workspace), format('{0}/**/*lock*', github.workspace), format('{0}/**/package-lock.json', github.workspace), format('{0}/**/poetry.lock', github.workspace)) }}
 
       - name: Notify (result)
         if: always()
@@ -114,5 +124,5 @@ jobs:
           VK_TEAMS_BOT_TOKEN: ${{ secrets.VK_TEAMS_BOT_TOKEN }}
           VK_TEAMS_CHAT_ID: ${{ secrets.VK_TEAMS_CHAT_ID }}
         with:
-          result: started
+          result: ${{ steps.build-step.outcome }}
           name: build tag ${{ inputs.tag }}

.github/workflows/deployk8s.yaml

@@ -24,7 +24,7 @@ on:
 
 jobs:
   deploy:
-    if: contains(format(',{0},', vars.ADMIN_USERS), format(',{0},', github.actor)) || inputs.environment=='stage'
+    if: ${{ contains(format(',{0},', vars.ADMIN_USERS), format(',{0},', github.actor)) || startsWith(inputs.environment, 'stage') }}
     runs-on: ubuntu-latest
     env:
       CR_REGISTRY: crp8vh46gd976oq8ipla
@@ -32,10 +32,12 @@ jobs:
       TAG: ${{ inputs.tag }}
     steps:
       - name: notify
-        uses: https://bb.hublab.ru/HUB/workflows/.gitea/actions/notify@HEAD
+        uses: https://bb.hublab.ru/HUB/workflows/.gitea/actions/vk-notify@main
+        env:
+          VK_TEAMS_BOT_TOKEN: ${{ secrets.VK_TEAMS_BOT_TOKEN }}
+          VK_TEAMS_CHAT_ID: ${{ secrets.VK_TEAMS_CHAT_ID }}
         with:
           result: 'started'
-          secrets: ${{ toJSON(secrets) }}
           name: deploy ${{ inputs.environment }} tag ${{ inputs.tag }}
       - name: deploy
         id: k8s_deploy 
@@ -47,8 +49,10 @@ jobs:
           migrate: ${{ inputs.migrate }}
       - name: post-notify
         if: always()
-        uses: https://bb.hublab.ru/HUB/workflows/.gitea/actions/notify@HEAD
+        uses: https://bb.hublab.ru/HUB/workflows/.gitea/actions/vk-notify@main
+        env:
+          VK_TEAMS_BOT_TOKEN: ${{ secrets.VK_TEAMS_BOT_TOKEN }}
+          VK_TEAMS_CHAT_ID: ${{ secrets.VK_TEAMS_CHAT_ID }}
         with:
           result: ${{ steps.k8s_deploy.outcome }}
-          name: k8s deploy ${{ inputs.environment }} tag ${{ inputs.tag }} 
-          secrets: ${{ toJSON(secrets) }}
+          name: k8s deploy ${{ inputs.environment }} tag ${{ inputs.tag }}