Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge releases/v3 into releases/v2 #2381

Merged
merged 25 commits into from
Jul 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e1f83c1
Fix #2367, add codeql-version to outputs
mschwager Jul 10, 2024
a4f3deb
Add note to CHANGELOG
mschwager Jul 10, 2024
b85b404
Update CHANGELOG.md
aeisenberg Jul 10, 2024
a9885c7
Update changelog and version after v3.25.12
github-actions[bot] Jul 12, 2024
9899511
Update checked-in dependencies
github-actions[bot] Jul 12, 2024
857f661
Merge pull request #2370 from github/mergeback/v3.25.12-to-main-4fa2a795
angelapwen Jul 12, 2024
e6438b3
Merge branch 'main' into add-codeql-version
mschwager Jul 12, 2024
09653b7
Merge pull request #2368 from mschwager/add-codeql-version
aeisenberg Jul 12, 2024
d2d99b1
Fix changelog entry section
henrymercer Jul 12, 2024
c2585ec
Merge pull request #2372 from github/henrymercer/fix-changelog
henrymercer Jul 12, 2024
3cf7236
Migrate to `eslint.config.mjs`
aeisenberg Jul 16, 2024
778c2bc
Fix eslint configuration
aeisenberg Jul 16, 2024
455bd98
Update checked-in dependencies
github-actions[bot] Jul 16, 2024
e6663d9
Update supported GitHub Enterprise Server versions
github-actions[bot] Jul 17, 2024
8e14792
Merge pull request #2374 from github/aeisenberg/eslint
aeisenberg Jul 17, 2024
f216681
Announce deprecation of CodeQL v2.13.4 and earlier
henrymercer Jul 17, 2024
58f46da
Add changelog note
henrymercer Jul 17, 2024
270a29d
Merge pull request #2375 from github/update-supported-enterprise-serv…
henrymercer Jul 17, 2024
232a8bc
Update changelog for v3.25.13
github-actions[bot] Jul 19, 2024
2d79040
Merge pull request #2379 from github/update-v3.25.13-270a29d1c
henrymercer Jul 19, 2024
700bccb
Revert "Update version and changelog for v2.25.12"
github-actions[bot] Jul 19, 2024
57d4608
Revert "Update checked-in dependencies"
github-actions[bot] Jul 19, 2024
6abdf6c
Merge remote-tracking branch 'origin/releases/v3' into backport-v2.25…
github-actions[bot] Jul 19, 2024
bc172e1
Update version and changelog for v2.25.13
github-actions[bot] Jul 19, 2024
4bcff1a
Update checked-in dependencies
github-actions[bot] Jul 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 0 additions & 71 deletions .eslintrc.json

This file was deleted.

7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th

Note that the only difference between `v2` and `v3` of the CodeQL Action is the node version they support, with `v3` running on node 20 while we continue to release `v2` to support running on node 16. For example `3.22.11` was the first `v3` release and is functionally identical to `2.22.11`. This approach ensures an easy way to track exactly which features are included in different versions, indicated by the minor and patch version numbers.

## 2.25.13 - 19 Jul 2024

- Add `codeql-version` to outputs. [#2368](https://github.com/github/codeql-action/pull/2368)
- Add a deprecation warning for customers using CodeQL version 2.13.4 and earlier. These versions of CodeQL were discontinued on 9 July 2024 alongside GitHub Enterprise Server 3.9, and will be unsupported by CodeQL Action versions 3.26.0 and later and versions 2.26.0 and later. [#2375](https://github.com/github/codeql-action/pull/2375)
- If you are using one of these versions, please update to CodeQL CLI version 2.13.5 or later. For instance, if you have specified a custom version of the CLI using the 'tools' input to the 'init' Action, you can remove this input to use the default version.
- Alternatively, if you want to continue using a version of the CodeQL CLI between 2.12.6 and 2.13.4, you can replace `github/codeql-action/*@v3` by `github/codeql-action/*@v3.25.13` and `github/codeql-action/*@v2` by `github/codeql-action/*@v2.25.13` in your code scanning workflow to ensure you continue using this version of the CodeQL Action.

## 2.25.12 - 12 Jul 2024

- Improve the reliability and performance of analyzing code when analyzing a compiled language with the `autobuild` [build mode](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#codeql-build-modes) on GitHub Enterprise Server. This feature is already available to GitHub.com users. [#2353](https://github.com/github/codeql-action/pull/2353)
Expand Down
149 changes: 149 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
// Automatically generated by running npx @eslint/migrate-config .eslintrc.json

import path from "node:path";
import { fileURLToPath } from "node:url";

import { fixupConfigRules, fixupPluginRules } from "@eslint/compat";
import { FlatCompat } from "@eslint/eslintrc";
import js from "@eslint/js";
import typescriptEslint from "@typescript-eslint/eslint-plugin";
import tsParser from "@typescript-eslint/parser";
import filenames from "eslint-plugin-filenames";
import github from "eslint-plugin-github";
import _import from "eslint-plugin-import";
import noAsyncForeach from "eslint-plugin-no-async-foreach";
import globals from "globals";

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all,
});

export default [
{
ignores: [
"**/webpack.config.js",
"lib/**/*",
"src/testdata/**/*",
"tests/**/*",
"eslint.config.mjs",
".github/**/*",
],
},
...fixupConfigRules(
compat.extends(
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/recommended-requiring-type-checking",
"plugin:github/recommended",
"plugin:github/typescript",
"plugin:import/typescript",
),
),
{
plugins: {
"@typescript-eslint": fixupPluginRules(typescriptEslint),
filenames: fixupPluginRules(filenames),
github: fixupPluginRules(github),
import: fixupPluginRules(_import),
"no-async-foreach": noAsyncForeach,
},

languageOptions: {
parser: tsParser,
ecmaVersion: 5,
sourceType: "module",

globals: {
...globals.node,
},

parserOptions: {
project: "./tsconfig.json",
},
},

settings: {
"import/resolver": {
node: {
moduleDirectory: ["node_modules", "src"],
},

typescript: {},
},
"import/ignore": ["sinon", "uuid", "@octokit/plugin-retry"],
},

rules: {
"filenames/match-regex": ["error", "^[a-z0-9-]+(\\.test)?$"],
"i18n-text/no-en": "off",

"import/extensions": [
"error",
{
json: {},
},
],

"import/no-amd": "error",
"import/no-commonjs": "error",
"import/no-cycle": "error",
"import/no-dynamic-require": "error",

"import/no-extraneous-dependencies": [
"error",
{
devDependencies: true,
},
],

"import/no-namespace": "off",
"import/no-unresolved": "error",
"import/no-webpack-loader-syntax": "error",

"import/order": [
"error",
{
alphabetize: {
order: "asc",
},

"newlines-between": "always",
},
],

"max-len": [
"error",
{
code: 120,
ignoreUrls: true,
ignoreStrings: true,
ignoreTemplateLiterals: true,
},
],

"no-async-foreach/no-async-foreach": "error",
"no-sequences": "error",
"no-shadow": "off",
"@typescript-eslint/no-shadow": "error",
"one-var": ["error", "never"],
},
},
{
files: ["**/*.ts", "**/*.js"],

rules: {
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-unsafe-assignment": "off",
"@typescript-eslint/no-unsafe-member-access": "off",
"@typescript-eslint/no-var-requires": "off",
"@typescript-eslint/prefer-regexp-exec": "off",
"@typescript-eslint/require-await": "off",
"@typescript-eslint/restrict-template-expressions": "off",
"func-style": "off",
},
},
];
2 changes: 2 additions & 0 deletions init/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ inputs:
outputs:
codeql-path:
description: The path of the CodeQL binary used for analysis
codeql-version:
description: The version of the CodeQL binary used for analysis
runs:
using: node16
main: '../lib/init-action.js'
Expand Down
2 changes: 1 addition & 1 deletion lib/api-compatibility.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{ "maximumVersion": "3.14", "minimumVersion": "3.9" }
{ "maximumVersion": "3.14", "minimumVersion": "3.10" }
6 changes: 3 additions & 3 deletions lib/codeql.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions lib/init-action.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading