From e4383189a5cdb94b056504e3cce2dbcecd1a8d78 Mon Sep 17 00:00:00 2001
From: Ainar Garipov <a.garipov@adguard.com>
Date: Mon, 7 Dec 2020 19:00:52 +0300
Subject: [PATCH] Pull request: all: fix github action result reporting

Merge in DNS/adguard-home from fix-gh-action-on-fail to master

Squashed commit of the following:

commit e8d48ee022772e0741de56dd955103efa27db0f6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Dec 7 18:54:14 2020 +0300

    all: remove tests

commit ecdcea9c3a2ee3adda3aca57c761963678547cb2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Dec 7 18:44:47 2020 +0300

    all: fix github action result reporting
---
 .github/workflows/build.yml | 13 +++++++++++--
 .github/workflows/lint.yml  | 13 +++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b59df4b1..b2851e53 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -121,7 +121,16 @@
     - 'docker'
     # Secrets are not passed to workflows that are triggered by a pull request
     # from a fork.
-    'if': "${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository }}"
+    #
+    # Use always() to signal to the runner that this job must run even if the
+    # previous ones failed.
+    'if':
+      ${{ always() &&
+        (
+          github.event_name == 'push' ||
+          github.event.pull_request.head.repo.full_name == github.repository
+        )
+      }}
     'runs-on': 'ubuntu-latest'
     'steps':
     - 'name': 'Conclusion'
@@ -130,7 +139,7 @@
       'uses': '8398a7/action-slack@v3'
       'with':
         'status': '${{ env.WORKFLOW_CONCLUSION }}'
-        'fields': 'repo, message, commit, author'
+        'fields': 'repo, message, commit, author, job'
       'env':
         'GITHUB_TOKEN': '${{ secrets.GITHUB_TOKEN }}'
         'SLACK_WEBHOOK_URL': '${{ secrets.SLACK_WEBHOOK_URL }}'
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index b48b508b..6fdabaf8 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -31,7 +31,16 @@
     - 'eslint'
     # Secrets are not passed to workflows that are triggered by a pull request
     # from a fork.
-    'if': "${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository }}"
+    #
+    # Use always() to signal to the runner that this job must run even if the
+    # previous ones failed.
+    'if':
+      ${{ always() &&
+        (
+          github.event_name == 'push' ||
+          github.event.pull_request.head.repo.full_name == github.repository
+        )
+      }}
     'runs-on': 'ubuntu-latest'
     'steps':
     - 'name': 'Conclusion'
@@ -40,7 +49,7 @@
       'uses': '8398a7/action-slack@v3'
       'with':
         'status': '${{ env.WORKFLOW_CONCLUSION }}'
-        'fields': 'repo, message, commit, author'
+        'fields': 'repo, message, commit, author, job'
       'env':
         'GITHUB_TOKEN': '${{ secrets.GITHUB_TOKEN }}'
         'SLACK_WEBHOOK_URL': '${{ secrets.SLACK_WEBHOOK_URL }}'