diff --git a/.github/workflow_data/discord.py b/.github/workflow_data/webhook.py similarity index 100% rename from .github/workflow_data/discord.py rename to .github/workflow_data/webhook.py diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 715070b83..37ec991e6 100644 --- 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 index 82fb6fa30..505f9c676 100644 --- 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 index 818aa7d84..da9ca2a87 100644 --- 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 index 1c4c39f8f..61bc01fcf 100644 --- 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 b/.github/workflows/sonarcloud.yaml similarity index 98% rename from .github/workflows/sonarqube.yaml rename to .github/workflows/sonarcloud.yaml index 7f3d311b0..e763aaad7 100644 --- a/.github/workflows/sonarqube.yaml +++ b/.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 b/.github/workflows/submodules.yml similarity index 96% rename from .github/workflows/check_submodules.yml rename to .github/workflows/submodules.yml index ad63f711b..52342fd04 100644 --- a/.github/workflows/check_submodules.yml +++ b/.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 b/.github/workflows/webhook.yml similarity index 73% rename from .github/workflows/discord.yml rename to .github/workflows/webhook.yml index 840f01d67..c3f4d9432 100644 --- a/.github/workflows/discord.yml +++ b/.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