Cleanup workflows

Flipper-XFW · Apr 22, 2023 · 4a6d5c4 · 4a6d5c4
1 parent c07c06a
commit 4a6d5c4
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 11 deletions.
diff --git a/.github/workflow_data/discord.py → .github/workflow_data/webhook.py b/.github/workflow_data/discord.py → .github/workflow_data/webhook.py
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: 'Build artifact'
+name: 'Build'
 
 on:
   push:
@@ -41,7 +41,7 @@ jobs:
         with:
           name: updater
           path: |
-            dist/${{ env.DEFAULT_TARGET }}-*
+            dist/${{ env.DEFAULT_TARGET }}-*/${{ env.DEFAULT_TARGET }}-update-*/
 
       # - name: 'Find Previous Comment'
       #   if: ${{ github.event.pull_request }}

diff --git a/.github/workflows/hotfix.yml b/.github/workflows/hotfix.yml
@@ -1,4 +1,4 @@
-name: "Hotfix integration"
+name: "Hotfix"
 
 on:
   pull_request_review:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -1,4 +1,4 @@
-name: 'Lint formatting'
+name: 'Lint'
 
 on:
   push:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,4 +1,4 @@
-name: "Release integration"
+name: 'Release'
 
 on:
   pull_request_review:

diff --git a/.github/workflows/sonarqube.yaml → .github/workflows/sonarcloud.yaml b/.github/workflows/sonarqube.yaml → .github/workflows/sonarcloud.yaml
@@ -1,4 +1,4 @@
-name: 'SonarCloud analysis'
+name: 'SonarCloud'
 
 on:
   workflow_dispatch:
@@ -10,7 +10,7 @@ env:
   DEFAULT_TARGET: f7
 
 jobs:
-  analyze:
+  sonarcloud:
     runs-on: ubuntu-latest
     env:
       SONAR_SCANNER_VERSION: 4.7.0.2747

diff --git a/.github/workflows/check_submodules.yml → .github/workflows/submodules.yml b/.github/workflows/check_submodules.yml → .github/workflows/submodules.yml
@@ -1,4 +1,4 @@
-name: 'Check submodules'
+name: 'Submodules'
 
 on:
   push:
@@ -10,7 +10,7 @@ on:
   pull_request:
 
 jobs:
-  check_protobuf:
+  submodules:
     runs-on: ubuntu-latest
     steps:
 

diff --git a/.github/workflows/discord.yml → .github/workflows/webhook.yml b/.github/workflows/discord.yml → .github/workflows/webhook.yml
@@ -1,4 +1,4 @@
-name: Discord webhook
+name: 'Webhook'
 
 on:
   push:
@@ -11,6 +11,14 @@ on:
     types:
       - "published"
   workflow_run:
+    workflows:
+      - "Build"
+      - "Hotfix"
+      - "Lint"
+      - "Release"
+      - "SonarCloud"
+      - "Submodules"
+      - "Webhook"
     types:
       - "completed"
   issues:
@@ -33,4 +41,4 @@ jobs:
       - name: Send webhook
         env:
           DEV_WEBHOOK: "https://discord.com/api/webhooks/${{ secrets.DEV_WEBHOOK_ID }}/${{ secrets.DEV_WEBHOOK_TOKEN }}"
-        run: python .github/workflow_data/discord.py
+        run: python .github/workflow_data/webhook.py