diff --git a/.github/workflows/slake-message-broker.yml b/.github/workflows/slack-message-broker.yml similarity index 65% rename from .github/workflows/slake-message-broker.yml rename to .github/workflows/slack-message-broker.yml index 6ac0d69d53c..b6a99501024 100644 --- a/.github/workflows/slake-message-broker.yml +++ b/.github/workflows/slack-message-broker.yml @@ -19,7 +19,6 @@ on: jobs: Send: runs-on: [ubuntu-latest] - # if: contains(fromJson('["success", "failure", "null", "skipped", "cancelled", "action_required", "neutral", "timed_out"]'), github.event.workflow_run.conclusion) steps: - name: Prepare Slack Message uses: actions/github-script@main @@ -29,10 +28,25 @@ jobs: const name = "${{ github.event.workflow_run.name }}"; const url = "${{ github.event.workflow_run.html_url }}"; const status = "${{ github.event.workflow_run.status }}"; - const action = "${{ github.event.action }}"; const conclusion = "${{ github.event.workflow_run.conclusion }}"; - const message = `Workflow '${name}' \`${action}\`: \`${status}\`, \`${conclusion}\`, <${url}|View Logs>`; - console.log(message) + const failure_conclusions = [ "failure", "null", "cancelled", "action_required", "neutral", "timed_out" ]; + let message = ""; + if (conclusion == "") { + message = `${name} \`${status}\` ⏳ <${url}|View Logs>`; + } + else if (conclusion == "success") { + message = `${name} \`${conclusion}\` ✅ <${url}|View Logs>`; + } + else if (conclusion == "skipped") { + message = `${name} \`${conclusion}\` ⏩ <${url}|View Logs>`; + } + else if (failure_conclusions.includes(conclusion)) { + message = `${name} \`${conclusion}\` ❌ <${url}|View Logs> @channel`; + } + else { + message = `${name} \`${conclusion}\` ⁉️ <${url}|View Logs> Unknown Conclusion @channel`; + } + console.log(message); core.setOutput("message", message); - name: Notify Slack diff --git a/scripts/combined-haddock.sh b/scripts/combined-haddock.sh index 8f9e58fe651..14262cd104c 100755 --- a/scripts/combined-haddock.sh +++ b/scripts/combined-haddock.sh @@ -316,7 +316,7 @@ echo "Looking for linkchecker" if ! command -v linkchecker &> /dev/null; then echo "linkchecker not found" exit 0 -done +fi echo "Running linkchecker"