[#3] Merge branch 'master' into v3

8398a7 · Jun 28, 2020 · 2def931 · 2def931
2 parents c68ef06 + a658209
commit 2def931
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/slack-mainline.yml b/.github/workflows/slack-mainline.yml
@@ -81,17 +81,17 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL_FOR_INTEGRATION_TEST }}
       - name: Custom Field2
-        uses: 8398a7/action-slack@pre
+        uses: 8398a7/action-slack@v3
         with:
           status: custom
-          fields: all
+          fields: workflow,job,commit,repo,ref,author,took
           custom_payload: |
             {
               username: 'action-slack',
               icon_emoji: ':octocat:',
               attachments: [{
-                color: 'good',
-                text: `${process.env.AS_WORKFLOW}\n${process.env.AS_JOB} (${process.env.AS_COMMIT}) of ${process.env.AS_REPO}@master by ${process.env.AS_AUTHOR} succeeded in ${process.env.AS_TOOK}`,
+                color: '${{ job.status }}' === 'success' ? 'good' : '${{ job.status }}' === 'failure' ? 'danger' : 'warning',
+                text: `${process.env.AS_WORKFLOW}\n${process.env.AS_JOB} (${process.env.AS_COMMIT}) of ${process.env.AS_REPO}@${process.env.AS_REF} by ${process.env.AS_AUTHOR} ${{ job.status }} in ${process.env.AS_TOOK}`,
               }]
             }
         env:

diff --git a/.github/workflows/slack-pre.yml b/.github/workflows/slack-pre.yml
@@ -77,14 +77,14 @@ jobs:
         uses: 8398a7/action-slack@pre
         with:
           status: custom
-          fields: all
+          fields: workflow,job,commit,repo,ref,author,took
           custom_payload: |
             {
               username: 'action-slack',
               icon_emoji: ':octocat:',
               attachments: [{
-                color: 'good',
-                text: `${process.env.AS_WORKFLOW}\n${process.env.AS_JOB} (${process.env.AS_COMMIT}) of ${process.env.AS_REPO}@master by ${process.env.AS_AUTHOR} succeeded in ${process.env.AS_TOOK}`,
+                color: '${{ job.status }}' === 'success' ? 'good' : '${{ job.status }}' === 'failure' ? 'danger' : 'warning',
+                text: `${process.env.AS_WORKFLOW}\n${process.env.AS_JOB} (${process.env.AS_COMMIT}) of ${process.env.AS_REPO}@${process.env.AS_REF} by ${process.env.AS_AUTHOR} ${{ job.status }} in ${process.env.AS_TOOK}`,
               }]
             }
         env:

diff --git a/README.md b/README.md
@@ -36,13 +36,13 @@ steps:
   - uses: 8398a7/action-slack@v3
   with:
     status: custom
-    fields: all
+    fields: workflow,job,commit,repo,ref,author,took
     custom_payload: |
       {
         username: 'action-slack',
         icon_emoji: ':octocat:',
         attachments: [{
-          color: 'good',
+          color: '${{ job.status }}' === 'success' ? 'good' : '${{ job.status }}' === 'failure' ? 'danger' : 'warning',
           text: `${process.env.AS_WORKFLOW}\n${process.env.AS_JOB} (${process.env.AS_COMMIT}) of ${process.env.AS_REPO}@master by ${process.env.AS_AUTHOR} succeeded in ${process.env.AS_TOOK}`,
         }]
       }
@@ -51,4 +51,4 @@ steps:
     SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
 ```
 
-<img width="633" alt="custom" src="https://user-images.githubusercontent.com/8043276/85947865-3723b800-b988-11ea-80f7-6db5329c6af7.png">
+<img width="510" alt="custom" src="https://user-images.githubusercontent.com/8043276/85949706-44926f80-b993-11ea-83bf-b3f81e5e2d8c.png">
diff --git a/docs/content/usecase/02-custom.md b/docs/content/usecase/02-custom.md
@@ -56,14 +56,14 @@ steps:
   - uses: 8398a7/action-slack@v3
     with:
       status: custom
-      fields: all
+      fields: workflow,job,commit,repo,ref,author,took
       custom_payload: |
         {
           username: 'action-slack',
           icon_emoji: ':octocat:',
           attachments: [{
-            color: 'good',
-            text: `${process.env.AS_WORKFLOW}\n${process.env.AS_JOB} (${process.env.AS_COMMIT}) of ${process.env.AS_REPO}@master by ${process.env.AS_AUTHOR} succeeded in ${process.env.AS_TOOK}`,
+            color: '${{ job.status }}' === 'success' ? 'good' : '${{ job.status }}' === 'failure' ? 'danger' : 'warning',
+            text: `${process.env.AS_WORKFLOW}\n${process.env.AS_JOB} (${process.env.AS_COMMIT}) of ${process.env.AS_REPO}@${process.env.AS_REF} by ${process.env.AS_AUTHOR} ${{ job.status }} in ${process.env.AS_TOOK}`,
           }]
         }
     env:
@@ -74,6 +74,6 @@ steps:
 You can access the values retrieved by Fields through environment variables.  
 See [Fields](/fields) for the available environment variables.
 
-<img width="633" alt="custom" src="https://user-images.githubusercontent.com/8043276/85947865-3723b800-b988-11ea-80f7-6db5329c6af7.png" />
+<img width="510" alt="custom" src="https://user-images.githubusercontent.com/8043276/85949706-44926f80-b993-11ea-83bf-b3f81e5e2d8c.png" />
 
 If there's a good format, I'd like to introduce it on this page from time to time.