Merge pull request #7 from voxmedia/jl-fix-owner-repo

Fix owner/repo fetching
voxmedia · Jan 17, 2020 · 5125947 · 5125947
2 parents 99e5a63 + 1624c2a
commit 5125947
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,6 +1,8 @@
 name: GitHub Action Slack Notify CI
 
-on: [push]
+on:
+  - push
+  - pull_request
 
 jobs:
   build:
@@ -18,7 +20,7 @@ jobs:
           SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
         uses: ./
         with:
-          channel: 'rp-notifications'
+          channel_id: CB9QT2NNR
           status: STARTED
           color: warning
       - name: Get yarn cache
@@ -42,6 +44,6 @@ jobs:
         uses: ./
         with:
           message_id: ${{ steps.slack.outputs.message_id }}
-          channel: 'rp-notifications'
+          channel_id: CB9QT2NNR
           status: SUCCESS
           color: good
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+- Fixes bug where owner/repo can not be determined with certain events (like scheduled jobs)
+
 # v1.1.0 - 11/19/2019
 
 - Add footer containing repo and timestamp

diff --git a/dist/index.js b/dist/index.js
@@ -9753,12 +9753,13 @@ function hasFirstPage (link) {
 /***/ }),
 
 /***/ 543:
-/***/ (function(module) {
+/***/ (function(module, __unusedexports, __webpack_require__) {
+
+const { context } = __webpack_require__(469);
 
 function buildSlackAttachments({ status, color, github }) {
   const { payload, ref, workflow, eventName } = github.context;
-  const owner = payload.repository.owner.login;
-  const name = payload.repository.name;
+  const { owner, repo } = context.repo;
   const event = eventName;
   const branch = event === 'pull_request' ? payload.pull_request.head.ref : ref.replace('refs/heads/', '');
 
@@ -9773,7 +9774,7 @@ function buildSlackAttachments({ status, color, github }) {
         }
       : {
           title: 'Branch',
-          value: `<https://github.com/${owner}/${name}/commit/${sha} | ${branch}>`,
+          value: `<https://github.com/${owner}/${repo}/commit/${sha} | ${branch}>`,
           short: true,
         };
 
@@ -9783,7 +9784,7 @@ function buildSlackAttachments({ status, color, github }) {
       fields: [
         {
           title: 'Action',
-          value: `<https://github.com/${owner}/${name}/commit/${sha}/checks | ${workflow}>`,
+          value: `<https://github.com/${owner}/${repo}/commit/${sha}/checks | ${workflow}>`,
           short: true,
         },
         {
@@ -9799,7 +9800,7 @@ function buildSlackAttachments({ status, color, github }) {
         },
       ],
       footer_icon: 'https://github.githubassets.com/favicon.ico',
-      footer: `<https://github.com/${owner}/${name} | ${owner}/${name}>`,
+      footer: `<https://github.com/${owner}/${repo} | ${owner}/${repo}>`,
       ts: Math.floor(Date.now() / 1000),
     },
   ];

diff --git a/src/utils.js b/src/utils.js
@@ -1,7 +1,8 @@
+const { context } = require('@actions/github');
+
 function buildSlackAttachments({ status, color, github }) {
   const { payload, ref, workflow, eventName } = github.context;
-  const owner = payload.repository.owner.login;
-  const name = payload.repository.name;
+  const { owner, repo } = context.repo;
   const event = eventName;
   const branch = event === 'pull_request' ? payload.pull_request.head.ref : ref.replace('refs/heads/', '');
 
@@ -16,7 +17,7 @@ function buildSlackAttachments({ status, color, github }) {
         }
       : {
           title: 'Branch',
-          value: `<https://github.com/${owner}/${name}/commit/${sha} | ${branch}>`,
+          value: `<https://github.com/${owner}/${repo}/commit/${sha} | ${branch}>`,
           short: true,
         };
 
@@ -26,7 +27,7 @@ function buildSlackAttachments({ status, color, github }) {
       fields: [
         {
           title: 'Action',
-          value: `<https://github.com/${owner}/${name}/commit/${sha}/checks | ${workflow}>`,
+          value: `<https://github.com/${owner}/${repo}/commit/${sha}/checks | ${workflow}>`,
           short: true,
         },
         {
@@ -42,7 +43,7 @@ function buildSlackAttachments({ status, color, github }) {
         },
       ],
       footer_icon: 'https://github.githubassets.com/favicon.ico',
-      footer: `<https://github.com/${owner}/${name} | ${owner}/${name}>`,
+      footer: `<https://github.com/${owner}/${repo} | ${owner}/${repo}>`,
       ts: Math.floor(Date.now() / 1000),
     },
   ];