Merge branch 'main' into new_notify

Reviewed-on: #48

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

@@ -10,16 +10,20 @@ inputs:
     required: false
     type: string
     default: build
-  token:
-    required: true
-    type: string
-  to:
-    required: true
-    type: string
 
 runs:
   using: 'composite'
   steps:
+    - name: Resolve token/from env if missing
+      shell: bash
+      run: |
+        if [ -z "${{ inputs.token }}" ] && [ -n "${VK_TEAMS_BOT_TOKEN}" ]; then
+          echo "token=${VK_TEAMS_BOT_TOKEN}" >> $GITHUB_ENV
+        fi
+        if [ -z "${{ inputs.to }}" ] && [ -n "${VK_TEAMS_CHAT_ID}" ]; then
+          echo "to=${VK_TEAMS_CHAT_ID}" >> $GITHUB_ENV
+        fi
+
     - name: Set icon
       id: icon
       shell: bash
@@ -32,15 +36,25 @@ runs:
           *) echo "ICON=ℹ️" >> $GITHUB_ENV ;;
         esac
 
-    - name: Notify VK Teams
+    - name: Notify VK Teams (native)
-      uses: dosymep/vk-teams-action@v1.0.0
+      if: always()
-      with:
+      shell: bash
-        token: ${{ inputs.token }}
+      continue-on-error: true
-        to: ${{ inputs.to }}
+      run: |
-        format: MarkdownV2
+        echo "[DEBUG] Sending VK Teams notification..."
-        message: |
+        curl -G "https://myteam.mail.ru/bot/v1/messages/sendText" \
-          *${{ github.repository }}* \- \[${{ inputs.name }}\]\(${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_number }}\) \
+          --data-urlencode "token=${{ env.token }}" \
-          was *${{ inputs.result }}* by ${{ github.event.sender.login }} ${{ env.ICON }}
+          --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: Wait a bit (ensure send completes)
+        CODE=$?
-      run: sleep 5
+        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,7 +11,14 @@ on:
       force_build:
         type: boolean
         default: false
-
+      arch:
+        type: string
+        default: "linux/amd64,linux/arm64/v8"
+    secrets:
+      VK_TEAMS_BOT_TOKEN:
+        required: true
+      VK_TEAMS_CHAT_ID:
+        required: true
 
 jobs:
   build:
@@ -20,13 +27,16 @@ jobs:
       CR_REGISTRY: crp8vh46gd976oq8ipla
       CR_REPO: ${{ github.event.repository.name }}
       IMAGE_TAG: ${{ github.sha }}
+
     steps:
-      - name: notify
+      - name: Notify (started)
-        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'
+          result: started
           name: build tag ${{ inputs.tag }}
-          secrets: ${{ toJSON(secrets) }}
 
       - uses: actions/checkout@v4
         with:
@@ -62,9 +72,10 @@ jobs:
       - name: Restore Docker layer cache
         uses: actions/cache/restore@v4
         with:
-          path: /cache/buildx-cache
+          path: /cache/${{ github.repository }}/buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          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
@@ -77,33 +88,41 @@ 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
+          mkdir -p /cache/${{ github.repository }}
-          mv /cache/buildx-cache-new /cache/buildx-cache
+          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
+          path: /cache/${{ github.repository }}/buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          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: post-notify
+      - name: Notify (result)
         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.build-step.outcome }}
           name: build tag ${{ inputs.tag }}
-          secrets: ${{ toJSON(secrets) }}

.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) }}

.github/workflows/notify.yaml

@@ -1,25 +1,25 @@
-# on:
+on:
-#   workflow_call:
+  workflow_call:
-#     inputs:
+    inputs:
-#       result:
+      result:
-#         required: false
+        required: false
-#         default: "failure" 
+        default: "failure" 
-#         type: string
+        type: string
-#       name:
+      name:
-#         required: false
+        required: false
-#         type: string
+        type: string
-#         default: build
+        default: build
-# jobs:
+jobs:
-#   notify:
+  notify:
-#     runs-on: gpu
+    runs-on: gpu
-#     steps:
+    steps:
-#     - uses: dosymep/vk-teams-action@v1.0.0
+    - uses: dosymep/vk-teams-action@v1.0.0
-#       env:
+      env:
-#         ICONS: '{"success":"✅","failure":"❌","canceled":"🤦","started":"⚠️"}'
+        ICONS: '{"success":"✅","failure":"❌","canceled":"🤦","started":"⚠️"}'
-#       with:
+      with:
-#         token: ${{ secrets.VK_TEAMS_BOT_TOKEN }}
+        token: ${{ secrets.VK_TEAMS_BOT_TOKEN }}
-#         to: ${{ secrets.VK_TEAMS_CHAT_ID }}
+        to: ${{ secrets.VK_TEAMS_CHAT_ID }}
-#         format: MarkdownV2
+        format: MarkdownV2
-#         message: |
+        message: |
-#             ${{ github.repository }} \[${{inputs.name}}\]\(${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_number }}\) was ${{ inputs.result }} by ${{ github.event.sender.login }} ${{ fromJson(env.ICONS)[inputs.result] }}
+            ${{ github.repository }} \[${{inputs.name}}\]\(${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_number }}\) was ${{ inputs.result }} by ${{ github.event.sender.login }} ${{ fromJson(env.ICONS)[inputs.result] }}