Commit d438a4b
authored
File tree
- .github
- node_modules
- @actions/core
- lib
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -88,6 +88,7 @@ def open_pr( | |||
| 88 | 88 | body.append('') | |
| 89 | 89 | body.append('Please review the following:') | |
| 90 | 90 | if len(conflicted_files) > 0: | |
| 91 | + body.append(' - [ ] The `package.json` file contains the correct version.') | ||
| 91 | 92 | body.append(' - [ ] You have added commits to this branch that resolve the merge conflicts ' + | |
| 92 | 93 | 'in the following files:') | |
| 93 | 94 | body.extend([f' - [ ] `{file}`' for file in conflicted_files]) | |
@@ -296,15 +297,15 @@ def main(): | |||
| 296 | 297 | ||
| 297 | 298 | # Migrate the package version number from a v2 version number to a v1 version number | |
| 298 | 299 | print(f'Setting version number to {version}') | |
| 299 | - subprocess.run(['npm', 'version', version, '--no-git-tag-version']) | ||
| 300 | + subprocess.check_output(['npm', 'version', version, '--no-git-tag-version']) | ||
| 300 | 301 | run_git('add', 'package.json', 'package-lock.json') | |
| 301 | 302 | ||
| 302 | 303 | # Migrate the changelog notes from v2 version numbers to v1 version numbers | |
| 303 | 304 | print('Migrating changelog notes from v2 to v1') | |
| 304 | - subprocess.run(['sed', '-i', 's/^## 2\./## 1./g', 'CHANGELOG.md']) | ||
| 305 | + subprocess.check_output(['sed', '-i', 's/^## 2\./## 1./g', 'CHANGELOG.md']) | ||
| 305 | 306 | ||
| 306 | 307 | # Remove changelog notes from v2 that don't apply to v1 | |
| 307 | - subprocess.run(['sed', '-i', '/^- \[v2+ only\]/d', 'CHANGELOG.md']) | ||
| 308 | + subprocess.check_output(['sed', '-i', '/^- \[v2+ only\]/d', 'CHANGELOG.md']) | ||
| 308 | 309 | ||
| 309 | 310 | # Amend the commit generated by `npm version` to update the CHANGELOG | |
| 310 | 311 | run_git('add', 'CHANGELOG.md') | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,9 @@ | |||
| 1 | 1 | # CodeQL Action Changelog | |
| 2 | 2 | ||
| 3 | + ## 1.1.20 - 22 Aug 2022 | ||
| 4 | + | ||
| 5 | + No user facing changes. | ||
| 6 | + | ||
| 3 | 7 | ## 1.1.19 - 17 Aug 2022 | |
| 4 | 8 | ||
| 5 | 9 | - Add the ability to filter queries from a code scanning run by using the `query-filters` option in the code scanning configuration file. [#1098](https://github.com/github/codeql-action/pull/1098) | |
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments