8000 Merge branch 'main' into henrymercer/java-buildless-rollback · github/codeql-action@eb60ca2 · GitHub
[go: up one dir, main page]
Skip to content

Commit eb60ca2

Browse files
henrymercerhenrymercer
committed
Merge branch 'main' into henrymercer/java-buildless-rollback
2 parents 65853b9 + c6cf6fd commit eb60ca2

File tree

128 files changed

+1109
-594
lines changed
  • package.json
  • visitor-keys
  • package-lock.json
  • package.json
  • src
  • tests/java-repo

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    128 files changed

    +1109
    -594
    lines changed

    ‎.github/update-release-branch.py

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -60,7 +60,7 @@ def open_pr(
    6060

    6161
    # Start constructing the body text
    6262
    body = []
    63-
    body.append(f'Merging {source_branch_short_sha} into {target_branch}.')
    63+
    body.append(f'Merging {source_branch_short_sha} into `{target_branch}`.')
    6464

    6565
    body.append('')
    6666
    body.append(f'Conductor for this PR is @{conductor}.')
    @@ -92,7 +92,7 @@ def open_pr(
    9292
    'branch to resolve the merge conflicts.')
    9393
    body.append(' - [ ] Ensure the CHANGELOG displays the correct version and date.')
    9494
    body.append(' - [ ] Ensure the CHANGELOG includes all relevant, user-facing changes since the last release.')
    95-
    body.append(f' - [ ] Check that there are not any unexpected commits being merged into the {target_branch} branch.')
    95+
    body.append(f' - [ ] Check that there are not any unexpected commits being merged into the `{target_branch}` branch.')
    9696
    body.append(' - [ ] Ensure the docs team is aware of any documentation changes that need to be released.')
    9797

    9898
    if not is_primary_release:

    ‎.github/workflows/debug-artifacts-failure.yml

    Lines changed: 1 addition & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -65,7 +65,7 @@ jobs:
    6565
    shell: bash
    6666
    run: |
    6767
    LANGUAGES="cpp csharp go java javascript python"
    68-
    pushd "./my-debug-artifacts"
    68+
    cd "./my-debug-artifacts"
    6969
    echo "Artifacts from run:"
    7070
    for language in $LANGUAGES; do
    7171
    echo "- Checking $language"
    @@ -82,6 +82,5 @@ jobs:
    8282
    exit 1
    8383
    fi
    8484
    done
    85-
    popd
    8685
    env:
    8786
    GO111MODULE: auto

    ‎.gitignore

    Lines changed: 6 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,2 +1,7 @@
    11
    # Ignore for example failing-tests.json from AVA
    2-
    node_modules/.cache
    2+
    node_modules/.cache/
    3+
    # Java build files
    4+
    .gradle/
    5+
    *.class
    6+
    # macOS
    7+
    .DS_Store

    ‎CHANGELOG.md

    Lines changed: 4 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -6,6 +6,10 @@ Note that the only difference between `v2` and `v3` of the CodeQL Action is the
    66

    77
    ## [UNRELEASED]
    88

    9+
    No user facing changes.
    10+
    11+
    ## 3.24.1 - 13 Feb 2024
    12+
    913
    - Update default CodeQL bundle version to 2.16.2. [#2124](https://github.com/github/codeql-action/pull/2124)
    1014
    - The CodeQL action no longer fails if it can't write to the telemetry api endpoint. [#2121](https://github.com/github/codeql-action/pull/2121)
    1115

    ‎lib/cli-errors.js

    Lines changed: 81 additions & 35 deletions
    Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

    ‎lib/cli-errors.js.map

    Lines changed: 1 addition & 1 deletion
    Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

    0 commit comments

    Comments
     (0)
    0