Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: github/codeql-action
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.26.0
Choose a base ref
...
head repository: github/codeql-action
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.26.1
Choose a head ref

Commits on Jul 26, 2024

  1. Add packs to init complete status report

    To support both the single language and multi language case we turn
    the single language case into a multi language case using the
    configured language.
    The entire packs record is then stored as a stringified JSON object.
    rvermeulen committed Jul 26, 2024
    Copy the full SHA
    a6c4760 View commit details
  2. Copy the full SHA
    25d2596 View commit details
  3. Add registries to the init status complete report

    Registries might require authentication, before we add it to the
    report we remove any credentials.
    rvermeulen committed Jul 26, 2024
    Copy the full SHA
    9f7e0af View commit details
  4. Reword comment

    rvermeulen committed Jul 26, 2024
    Copy the full SHA
    060c11b View commit details

Commits on Jul 31, 2024

  1. Address formatting issues

    rvermeulen committed Jul 31, 2024
    Copy the full SHA
    7ff117d View commit details
  2. Copy the full SHA
    b7b85bb View commit details
  3. Copy the full SHA
    19a1da5 View commit details

Commits on Aug 1, 2024

  1. Copy the full SHA
    7be3a64 View commit details
  2. Copy the full SHA
    ba3ac6f View commit details

Commits on Aug 2, 2024

  1. Explicitly set value of registries and query_filters when undefined

    Both are arrays, so we will use an empty array if they are undefined.
    rvermeulen committed Aug 2, 2024
    Copy the full SHA
    e6c9383 View commit details
  2. Merge branch 'main' into rvermeulen/extend-init-complete-status-report

    Signed-off-by: Remco Vermeulen <rvermeulen@github.com>
    rvermeulen committed Aug 2, 2024
    Copy the full SHA
    0f24d46 View commit details

Commits on Aug 6, 2024

  1. Merge remote-tracking branch 'upstream/main' into rvermeulen/extend-i…

    …nit-complete-status-report
    rvermeulen committed Aug 6, 2024
    Copy the full SHA
    7c2bec0 View commit details
  2. Copy the full SHA
    1c5b392 View commit details
  3. Copy the full SHA
    ecf4658 View commit details
  4. Copy the full SHA
    50d1f40 View commit details
  5. Merge pull request #2412 from github/henrymercer/update-required-igno…

    …re-skipped
    
    Required checks script: Ignore skipped jobs
    henrymercer authored Aug 6, 2024
    Copy the full SHA
    c056c18 View commit details
  6. Merge pull request #2411 from github/mergeback/v3.26.0-to-main-eb055d73

    Mergeback v3.26.0 refs/heads/releases/v3 into main
    henrymercer authored Aug 6, 2024
    Copy the full SHA
    3ec2588 View commit details
  7. Copy the full SHA
    a8ab493 View commit details
  8. Merge pull request #2394 from rvermeulen/rvermeulen/extend-init-compl…

    …ete-status-report
    
    Extend init complete status report
    rvermeulen authored Aug 6, 2024
    Copy the full SHA
    5c02493 View commit details

Commits on Aug 8, 2024

  1. Copy the full SHA
    6ef274e View commit details
  2. Copy the full SHA
    def1e35 View commit details
  3. Copy the full SHA
    18c419e View commit details
  4. Copy the full SHA
    5d9950f View commit details
  5. Copy the full SHA
    50357f5 View commit details
  6. Copy the full SHA
    44ecae4 View commit details
  7. Merge pull request #2418 from github/henrymercer/extraction-time-tele…

    …metry
    
    Add telemetry for time spent extracting CodeQL bundle
    henrymercer authored Aug 8, 2024
    Copy the full SHA
    25ad3c8 View commit details

Commits on Aug 12, 2024

  1. Bump the npm group with 4 updates (#2419)

    * Bump the npm group with 4 updates
    
    Bumps the npm group with 4 updates: [adm-zip](https://github.com/cthackers/adm-zip), [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js), [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser).
    
    
    Updates `adm-zip` from 0.5.14 to 0.5.15
    - [Release notes](https://github.com/cthackers/adm-zip/releases)
    - [Changelog](https://github.com/cthackers/adm-zip/blob/master/history.md)
    - [Commits](cthackers/adm-zip@v0.5.14...v0.5.15)
    
    Updates `@eslint/js` from 9.8.0 to 9.9.0
    - [Release notes](https://github.com/eslint/eslint/releases)
    - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
    - [Commits](https://github.com/eslint/eslint/commits/v9.9.0/packages/js)
    
    Updates `@typescript-eslint/eslint-plugin` from 8.0.1 to 8.1.0
    - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
    - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
    - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.1.0/packages/eslint-plugin)
    
    Updates `@typescript-eslint/parser` from 8.0.1 to 8.1.0
    - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
    - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
    - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.1.0/packages/parser)
    
    ---
    updated-dependencies:
    - dependency-name: adm-zip
      dependency-type: direct:production
      update-type: version-update:semver-patch
      dependency-group: npm
    - dependency-name: "@eslint/js"
      dependency-type: direct:development
      update-type: version-update:semver-minor
      dependency-group: npm
    - dependency-name: "@typescript-eslint/eslint-plugin"
      dependency-type: direct:development
      update-type: version-update:semver-minor
      dependency-group: npm
    - dependency-name: "@typescript-eslint/parser"
      dependency-type: direct:development
      update-type: version-update:semver-minor
      dependency-group: npm
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    * Update checked-in dependencies
    
    ---------
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    dependabot[bot] and github-actions[bot] authored Aug 12, 2024
    Copy the full SHA
    d620faa View commit details

Commits on Aug 13, 2024

  1. Log job run UUID

    henrymercer committed Aug 13, 2024
    Copy the full SHA
    41833c7 View commit details
  2. Merge pull request #2417 from github/update-bundle/codeql-bundle-v2.18.2

    Update default bundle to 2.18.2
    alexet authored Aug 13, 2024
    Copy the full SHA
    c4c3c44 View commit details
  3. Copy the full SHA
    da9ecb0 View commit details
  4. Merge pull request #2416 from github/henrymercer/ghes-3.14-compat-info

    Add details of supported versions for GHES 3.14
    henrymercer authored Aug 13, 2024
    Copy the full SHA
    0d5982a View commit details
  5. Copy the full SHA
    18ac79e View commit details
  6. Revert "Merge pull request #2417 from github/update-bundle/codeql-bun…

    …dle-v2.18.2"
    
    This reverts commit c4c3c44, reversing
    changes made to d620faa.
    rvermeulen committed Aug 13, 2024
    Copy the full SHA
    5b15b9e View commit details
  7. Merge pull request #2422 from github/update-v3.26.1-0d5982aa3

    Merge main into releases/v3
    rvermeulen authored Aug 13, 2024
    Copy the full SHA
    29d86d2 View commit details
Showing with 1,932 additions and 858 deletions.
  1. +1 −0 .github/workflows/__submit-sarif-failure.yml
  2. +1 −2 .github/workflows/script/update-required-checks.sh
  3. +4 −0 CHANGELOG.md
  4. +8 −7 README.md
  5. +3 −6 lib/codeql.js
  6. +1 −1 lib/codeql.js.map
  7. +9 −9 lib/codeql.test.js
  8. +1 −1 lib/codeql.test.js.map
  9. +7 −0 lib/config-utils.js
  10. +1 −1 lib/config-utils.js.map
  11. +7 −2 lib/diagnostics.js
  12. +1 −1 lib/diagnostics.js.map
  13. +46 −8 lib/init-action.js
  14. +1 −1 lib/init-action.js.map
  15. +2 −2 lib/init.js
  16. +1 −1 lib/init.js.map
  17. +17 −11 lib/setup-codeql.js
  18. +1 −1 lib/setup-codeql.js.map
  19. +10 −4 lib/setup-codeql.test.js
  20. +1 −1 lib/setup-codeql.test.js.map
  21. +4 −0 lib/util.js
  22. +1 −1 lib/util.js.map
  23. +49 −48 node_modules/.package-lock.json
  24. +1 −1 node_modules/@eslint/js/package.json
  25. +9 −3 node_modules/@typescript-eslint/eslint-plugin/dist/rules/member-ordering.js
  26. +1 −1 node_modules/@typescript-eslint/eslint-plugin/dist/rules/member-ordering.js.map
  27. +5 −7 node_modules/@typescript-eslint/eslint-plugin/dist/rules/naming-convention.js
  28. +1 −1 node_modules/@typescript-eslint/eslint-plugin/dist/rules/naming-convention.js.map
  29. +19 −14 node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-floating-promises.js
  30. +1 −1 node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-floating-promises.js.map
  31. +69 −2 node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-misused-promises.js
  32. +1 −1 node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-misused-promises.js.map
  33. +2 −2 node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-shadow.js
  34. +1 −1 node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-shadow.js.map
  35. +44 −31 node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unnecessary-type-parameters.js
  36. +1 −1 node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unnecessary-type-parameters.js.map
  37. +31 −8 node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unsafe-return.js
  38. +1 −1 node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unsafe-return.js.map
  39. +2 −2 node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-use-before-define.js
  40. +1 −1 node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-use-before-define.js.map
  41. +47 −14 node_modules/@typescript-eslint/eslint-plugin/dist/rules/prefer-optional-chain-utils/analyzeChain.js
  42. +1 −1 ...dules/@typescript-eslint/eslint-plugin/dist/rules/prefer-optional-chain-utils/analyzeChain.js.map
  43. +2 −2 node_modules/@typescript-eslint/eslint-plugin/dist/rules/prefer-optional-chain.js
  44. +1 −1 node_modules/@typescript-eslint/eslint-plugin/dist/rules/prefer-optional-chain.js.map
  45. +7 −0 node_modules/@typescript-eslint/eslint-plugin/dist/util/getFixOrSuggest.js
  46. +1 −0 node_modules/@typescript-eslint/eslint-plugin/dist/util/getFixOrSuggest.js.map
  47. +1 −1 node_modules/@typescript-eslint/eslint-plugin/dist/util/getWrappingFixer.js
  48. +1 −0 node_modules/@typescript-eslint/eslint-plugin/dist/util/index.js
  49. +1 −1 node_modules/@typescript-eslint/eslint-plugin/dist/util/index.js.map
  50. +1 −1 node_modules/@typescript-eslint/eslint-plugin/dist/util/misc.js.map
  51. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/ban-types.md
  52. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/block-spacing.md
  53. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/brace-style.md
  54. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/camelcase.md
  55. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/comma-dangle.md
  56. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/comma-spacing.md
  57. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/func-call-spacing.md
  58. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/indent.md
  59. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/key-spacing.md
  60. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/keyword-spacing.md
  61. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/lines-around-comment.md
  62. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/lines-between-class-members.md
  63. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/member-delimiter-style.md
  64. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/no-duplicate-imports.mdx
  65. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/no-extra-parens.md
  66. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/no-extra-semi.md
  67. +98 −53 node_modules/@typescript-eslint/eslint-plugin/docs/rules/no-misused-promises.mdx
  68. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/no-parameter-properties.mdx
  69. +3 −3 node_modules/@typescript-eslint/eslint-plugin/docs/rules/no-unnecessary-type-parameters.mdx
  70. +9 −1 node_modules/@typescript-eslint/eslint-plugin/docs/rules/no-unsafe-return.mdx
  71. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/no-useless-template-literals.mdx
  72. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/object-curly-spacing.md
  73. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/padding-line-between-statements.md
  74. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/quotes.md
  75. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/semi.md
  76. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/sort-type-union-intersection-members.mdx
  77. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/space-before-blocks.md
  78. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/space-before-function-paren.md
  79. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/space-infix-ops.md
  80. +2 −2 node_modules/@typescript-eslint/eslint-plugin/docs/rules/strict-boolean-expressions.mdx
  81. +4 −0 node_modules/@typescript-eslint/eslint-plugin/docs/rules/type-annotation-spacing.md
  82. +7 −7 node_modules/@typescript-eslint/eslint-plugin/package.json
  83. +5 −5 node_modules/@typescript-eslint/parser/package.json
  84. +4 −4 node_modules/@typescript-eslint/scope-manager/package.json
  85. +5 −4 node_modules/@typescript-eslint/type-utils/dist/predicates.d.ts
  86. +1 −1 node_modules/@typescript-eslint/type-utils/dist/predicates.d.ts.map
  87. +17 −6 node_modules/@typescript-eslint/type-utils/dist/predicates.js
  88. +1 −1 node_modules/@typescript-eslint/type-utils/dist/predicates.js.map
  89. +4 −4 node_modules/@typescript-eslint/type-utils/package.json
  90. +96 −46 node_modules/@typescript-eslint/types/dist/generated/ast-spec.d.ts
  91. +1 −1 node_modules/@typescript-eslint/types/dist/generated/ast-spec.d.ts.map
  92. +15 −0 node_modules/@typescript-eslint/types/dist/ts-estree.d.ts
  93. +1 −1 node_modules/@typescript-eslint/types/dist/ts-estree.d.ts.map
  94. +1 −1 node_modules/@typescript-eslint/types/dist/ts-estree.js.map
  95. +1 −1 node_modules/@typescript-eslint/types/package.json
  96. +1 −1 node_modules/@typescript-eslint/typescript-estree/dist/convert.d.ts.map
  97. +63 −7 node_modules/@typescript-eslint/typescript-estree/dist/convert.js
  98. +1 −1 node_modules/@typescript-eslint/typescript-estree/dist/convert.js.map
  99. +1 −1 node_modules/@typescript-eslint/typescript-estree/dist/node-utils.d.ts.map
  100. +1 −0 node_modules/@typescript-eslint/typescript-estree/dist/node-utils.js
  101. +1 −1 node_modules/@typescript-eslint/typescript-estree/dist/node-utils.js.map
  102. +3 −3 node_modules/@typescript-eslint/typescript-estree/package.json
  103. +6 −5 node_modules/@typescript-eslint/utils/dist/ts-eslint/Config.d.ts
  104. +1 −1 node_modules/@typescript-eslint/utils/dist/ts-eslint/Config.d.ts.map
  105. +1 −1 node_modules/@typescript-eslint/utils/dist/ts-eslint/ESLint.d.ts.map
  106. +0 −1 node_modules/@typescript-eslint/utils/dist/ts-eslint/ESLint.js
  107. +1 −1 node_modules/@typescript-eslint/utils/dist/ts-eslint/ESLint.js.map
  108. +4 −4 node_modules/@typescript-eslint/utils/package.json
  109. +2 −2 node_modules/@typescript-eslint/visitor-keys/package.json
  110. +23 −2 node_modules/adm-zip/README.md
  111. +326 −164 node_modules/adm-zip/adm-zip.js
  112. +86 −52 node_modules/adm-zip/headers/entryHeader.js
  113. +1 −1 node_modules/adm-zip/headers/mainHeader.js
  114. +2 −1 node_modules/adm-zip/methods/zipcrypto.js
  115. +3 −2 node_modules/adm-zip/package.json
  116. +5 −0 node_modules/adm-zip/util/decoder.js
  117. +32 −5 node_modules/adm-zip/util/errors.js
  118. +1 −4 node_modules/adm-zip/util/fattr.js
  119. +0 −11 node_modules/adm-zip/util/fileSystem.js
  120. +1 −0 node_modules/adm-zip/util/index.js
  121. +113 −24 node_modules/adm-zip/util/utils.js
  122. +95 −44 node_modules/adm-zip/zipEntry.js
  123. +114 −52 node_modules/adm-zip/zipFile.js
  124. +54 −53 package-lock.json
  125. +5 −5 package.json
  126. +1 −0 pr-checks/checks/submit-sarif-failure.yml
  127. +23 −9 src/codeql.test.ts
  128. +16 −16 src/codeql.ts
  129. +9 −0 src/config-utils.ts
  130. +8 −3 src/diagnostics.ts
  131. +76 −9 src/init-action.ts
  132. +4 −4 src/init.ts
  133. +10 −4 src/setup-codeql.test.ts
  134. +25 −16 src/setup-codeql.ts
  135. +4 −0 src/util.ts
1 change: 1 addition & 0 deletions .github/workflows/__submit-sarif-failure.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/script/update-required-checks.sh
Original file line number Diff line number Diff line change
@@ -28,8 +28,7 @@ fi
echo "Getting checks for $GITHUB_SHA"

# Ignore any checks with "https://", CodeQL, LGTM, and Update checks.
# Also ignore the non-matrixed "Unit Tests" job that only runs on pushes to protected branches.
CHECKS="$(gh api repos/github/codeql-action/commits/"${GITHUB_SHA}"/check-runs --paginate | jq --slurp --compact-output --raw-output '[.[].check_runs | .[].name | select(contains("https://") or . == "CodeQL" or . == "Dependabot" or . == "check-expected-release-files" or . == "Unit Tests" or contains("Update") or contains("update") or contains("test-setup-python-scripts") | not)] | unique | sort')"
CHECKS="$(gh api repos/github/codeql-action/commits/"${GITHUB_SHA}"/check-runs --paginate | jq --slurp --compact-output --raw-output '[.[].check_runs.[] | select(.conclusion != "skipped") | .name | select(contains("https://") or . == "CodeQL" or . == "Dependabot" or . == "check-expected-release-files" or contains("Update") or contains("update") or contains("test-setup-python-scripts") | not)] | unique | sort')"

echo "$CHECKS" | jq

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -4,6 +4,10 @@ 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.

## 3.26.1 - 13 Aug 2024

No user facing changes.

## 3.26.0 - 06 Aug 2024

- _Deprecation:_ Swift analysis on Ubuntu runner images is no longer supported. Please migrate to a macOS runner if this affects you. [#2403](https://github.com/github/codeql-action/pull/2403)
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -33,17 +33,18 @@ To provide the best experience to customers using older versions of GitHub Enter

For more information, see "[Code scanning: deprecation of CodeQL Action v2](https://github.blog/changelog/2024-01-12-code-scanning-deprecation-of-codeql-action-v2/)."

## Supported versions of the CodeQL CLI and GitHub Enterprise Server
## Supported versions of the CodeQL Bundle and GitHub Enterprise Server

We typically release new minor versions of the CodeQL Action and CLI when a new minor version of GitHub Enterprise Server (GHES) is released. When a version of GHES is deprecated, the CodeQL Action and CLI releases that shipped with it are deprecated as well.
We typically release new minor versions of the CodeQL Action and Bundle when a new minor version of GitHub Enterprise Server (GHES) is released. When a version of GHES is deprecated, the CodeQL Action and Bundle releases that shipped with it are deprecated as well.

| Recommended CodeQL Action | Recommended CodeQL CLI Version | GitHub Environment |
| Recommended CodeQL Action | Recommended CodeQL Bundle Version | GitHub Environment |
|---------|----------|--------------|
| `v3` | default (do not pass a `tools` input) | GitHub.com |
| `v3.24.11` | `v2.16.6` | Enterprise Server 3.13 |
| `3.22.12` | `2.15.5` | Enterprise Server 3.12 |
| `2.22.1` | `2.14.6` | Enterprise Server 3.11 |
| `2.20.3` | `2.13.5` | Enterprise Server 3.10 |
| `v3.25.11` | `2.17.6` | Enterprise Server 3.14 |
| `v3.24.11` | `2.16.6` | Enterprise Server 3.13 |
| `v3.22.12` | `2.15.5` | Enterprise Server 3.12 |
| `v2.22.1` | `2.14.6` | Enterprise Server 3.11 |
| `v2.20.3` | `2.13.5` | Enterprise Server 3.10 |

CodeQL Action `v2` will stop receiving updates when GHES 3.11 is deprecated.

9 changes: 3 additions & 6 deletions lib/codeql.js

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

Loading