More GitHub actions support (#943)

* Support local actions * Support actions in subfolders * Generate e2e fixture which includes current sha * fixup! Generate e2e fixture which includes current sha * fixup! Generate e2e fixture which includes current sha * fixup! Generate e2e fixture which includes current sha * fixup! Generate e2e fixture which includes current sha * Remove relative action test * Check both main and master branches Co-authored-by: Stefan Buck <[email protected]>
OctoLinker · Jul 12, 2020 · 9e606a9 · 9e606a9
1 parent 392bd8c
commit 9e606a9
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/e2e/fixtures/.github/workflows/ci.yml b/e2e/fixtures/.github/workflows/ci.yml
@@ -11,3 +11,5 @@ jobs:
  - uses: actions/setup-node
  # @OctoLinkerResolve(https://github.com/actions/upload-artifact)
  - uses: actions/upload-artifact@master
+ # @OctoLinkerResolve(https://github.com/github/codeql-action/tree/main/init)
+ - uses: github/codeql-action/init@v1
diff --git a/e2e/generate-fixtures-json.js b/e2e/generate-fixtures-json.js
@@ -18,11 +18,14 @@ const async = require('async');
 // ]
 
 let username;
+let sha = 'HEAD';
 
 if (process.env.GITHUB_EVENT_PATH) {
  const json = JSON.parse(fs.readFileSync(process.env.GITHUB_EVENT_PATH));
  if (json && json.pull_request) {
  username = json.pull_request.head.user.login;
+ // eslint-disable-next-line prefer-destructuring
+ sha = json.pull_request.head.sha;
  }
 }
 
@@ -31,6 +34,7 @@ const branch = process.env.GITHUB_HEAD_REF || 'master';
 const fixturesRoot = `https://github.com/${user}/OctoLinker/blob/${branch}/e2e`;
 
 console.log('Fixtures root:', fixturesRoot); // eslint-disable-line no-console
+console.log('Fixtures sha:', sha); // eslint-disable-line no-console
 
 async function readContent(files) {
  const readFile = util.promisify(fs.readFile);
@@ -61,7 +65,12 @@ function findTests(contents) {
 
  const targetUrl = line
  .match(/@OctoLinkerResolve(Above)?\((.*?)\)/)[2]
- .replace('<root>', '');
+ .replace('<root>', '')
+ .replace('<sha>', sha)
+ .replace(
+ 'https://github.com/OctoLinker/OctoLinker/tree/',
+ `https://github.com/${user}/OctoLinker/tree/`,
+ );
 
  const filePath = file.replace(__dirname, '');
 

diff --git a/packages/plugin-github-actions/index.js b/packages/plugin-github-actions/index.js
@@ -1,3 +1,4 @@
+import { join } from 'path';
 import { GITHUB_ACTIONS } from '@octolinker/helper-grammar-regex-collection';
 
 export default {
@@ -8,6 +9,21 @@ export default {
  return '';
  }
 
+ if (target.startsWith('.')) {
+ const [, org, repo, , sha] = path.split('/');
+
+ return `{BASE_URL}/${join(org, repo, 'tree', sha, target)}`;
+ }
+
+ const [org, repo, ...folder] = target.split('/');
+
+ if (folder.length) {
+ return [
+ `{BASE_URL}/${join(org, repo, 'tree', 'main', ...folder)}`,
+ `{BASE_URL}/${join(org, repo, 'tree', 'master', ...folder)}`,
+ ];
+ }
+
  return `{BASE_URL}/${target}`;
  },