Merge pull request #643 from stoplightio/fix/640-regression

github check created after loading ruleset
stoplightio · Jun 7, 2022 · 6018583 · 6018583
2 parents 4842a6b + da315eb
commit 6018583
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -133,13 +133,13 @@ const program = pipe(
     TE.fromEither(getRepositoryInfoFromEvent(config.GITHUB_EVENT_PATH, config.INPUT_EVENT_NAME))
   ),
   TE.bind('octokit', ({ config }) => TE.fromEither(createOctokitInstance(config.INPUT_REPO_TOKEN))),
-  TE.bind('check', ({ octokit, repositoryInfo }) =>
-    createGithubCheck(octokit, repositoryInfo, `${CHECK_NAME} (${repositoryInfo.eventName})`)
-  ),
   TE.bind('fileContents', ({ config }) => readFilesToAnalyze(config.INPUT_FILE_GLOB, config.GITHUB_WORKSPACE)),
   TE.bind('annotations', ({ fileContents, config }) =>
     createSpectralAnnotations(config.INPUT_SPECTRAL_RULESET, fileContents, config.GITHUB_WORKSPACE)
   ),
+  TE.bind('check', ({ octokit, repositoryInfo }) =>
+    createGithubCheck(octokit, repositoryInfo, `${CHECK_NAME} (${repositoryInfo.eventName})`)
+  ),
   TE.bind('checkResponse', ({ octokit, check, repositoryInfo, annotations }) =>
     updateGithubCheck(
       octokit,

diff --git a/src/spectral.ts b/src/spectral.ts
@@ -8,7 +8,7 @@ import * as TE from 'fp-ts/TaskEither';
 import * as E from 'fp-ts/Either';
 import { pipe } from 'fp-ts/pipeable';
 
-import { info } from '@actions/core';
+import { info, setFailed } from '@actions/core';
 import { getRuleset } from './getRuleset';
 
 const retrieveSpectralPackageVersion = (): IOEither.IOEither<Error, string> =>
@@ -25,7 +25,14 @@ export const createSpectral = (rulesetPath: string) =>
         info(`Running @stoplight/spectral-core v${spectralPackageVersion}`);
 
         const spectral = new Spectral({ resolver: httpAndFileResolver });
-        spectral.setRuleset(await getRuleset(rulesetPath));
+
+        try {
+          const ruleset = await getRuleset(rulesetPath);
+          spectral.setRuleset(ruleset);
+        } catch (e) {
+          setFailed('Issue loading ruleset');
+          throw e;
+        }
 
         const loadedRules = Object.values(spectral.ruleset!.rules);
         info(` - ${pluralize('rule', loadedRules.length)} (${loadedRules.filter(r => r.enabled).length} enabled)`);