From b419ff6d7b5eaa802c5ac487d43f81187a272c23 Mon Sep 17 00:00:00 2001
From: David Verdeguer <daverlo@github.com>
Date: Wed, 29 Apr 2020 11:43:39 +0200
Subject: [PATCH 1/2] Error on queries with missing/multiple languages
---
lib/finalize-db.js | 4 ++--
src/finalize-db.ts | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/finalize-db.js b/lib/finalize-db.js
index 8679a7d0f..f73bb4951 100644
--- a/lib/finalize-db.js
+++ b/lib/finalize-db.js
@@ -73,12 +73,12 @@ async function resolveQueryLanguages(codeqlCmd, config) {
const noDeclaredLanguage = resolveQueriesOutputObject.noDeclaredLanguage;
const noDeclaredLanguageQueries = Object.keys(noDeclaredLanguage);
if (noDeclaredLanguageQueries.length !== 0) {
- core.warning('Some queries do not declare a language:\n' + noDeclaredLanguageQueries.join('\n'));
+ throw new Error('Some queries do not declare a language, their qlpack.yml file is missing or is invalid');
}
const multipleDeclaredLanguages = resolveQueriesOutputObject.multipleDeclaredLanguages;
const multipleDeclaredLanguagesQueries = Object.keys(multipleDeclaredLanguages);
if (multipleDeclaredLanguagesQueries.length !== 0) {
- core.warning('Some queries declare multiple languages:\n' + multipleDeclaredLanguagesQueries.join('\n'));
+ throw new Error('Some queries declare multiple languages, their qlpack.yml file is missing or is invalid');
}
}
return res;
diff --git a/src/finalize-db.ts b/src/finalize-db.ts
index a03e68a1b..b9605b0e2 100644
--- a/src/finalize-db.ts
+++ b/src/finalize-db.ts
@@ -82,13 +82,13 @@ async function resolveQueryLanguages(codeqlCmd: string, config: configUtils.Conf
const noDeclaredLanguage = resolveQueriesOutputObject.noDeclaredLanguage;
const noDeclaredLanguageQueries = Object.keys(noDeclaredLanguage);
if (noDeclaredLanguageQueries.length !== 0) {
- core.warning('Some queries do not declare a language:\n' + noDeclaredLanguageQueries.join('\n'));
+ throw new Error('Some queries do not declare a language, their qlpack.yml file is missing or is invalid');
}
const multipleDeclaredLanguages = resolveQueriesOutputObject.multipleDeclaredLanguages;
const multipleDeclaredLanguagesQueries = Object.keys(multipleDeclaredLanguages);
if (multipleDeclaredLanguagesQueries.length !== 0) {
- core.warning('Some queries declare multiple languages:\n' + multipleDeclaredLanguagesQueries.join('\n'));
+ throw new Error('Some queries declare multiple languages, their qlpack.yml file is missing or is invalid');
}
}
From 20a0628ed73a0cbde47da41ab316fa9ba13a3fcc Mon Sep 17 00:00:00 2001
From: Robert <robertbrignull@github.com>
Date: Wed, 29 Apr 2020 16:45:47 +0100
Subject: [PATCH 2/2] Fix typos / errors in PR template
---
.github/pull_request_template.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index d6467871a..ca84204a3 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,7 +1,7 @@
### Merge / deployment checklist
-- Run test builds as necessary. Can be on this repository or elsewhere as needed in order to test the change - please include links to tests in otehr repos!
- - [ ] CodeQL using init/finish actions
+- Run test builds as necessary. Can be on this repository or elsewhere as needed in order to test the change - please include links to tests in other repos!
+ - [ ] CodeQL using init/analyze actions
- [ ] 3rd party tool using upload action
- [ ] Confirm this change is backwards compatible with existing workflows.
-- [ ] Confirm the [readme](https://github.com/github/codeql-action/blob/master/README.md) has been updated if necessary.
\ No newline at end of file
+- [ ] Confirm the [readme](https://github.com/github/codeql-action/blob/master/README.md) has been updated if necessary.