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.

Sign up for GitHub

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

Jump to bottom

Merge releases/v3 into releases/v2 #2144

Merged
merged 28 commits into from
Feb 15, 2024
Merged

Merge releases/v3 into releases/v2 #2144

merged 28 commits into from
Feb 15, 2024

Commits on Feb 12, 2024

  1. Add feature flag for disabling Java buildless

    @henrymercer
    henrymercer committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    77be28f View commit details
    Browse the repository at this point in the history

  2. Introduce a rollback mechanism for Java buildless

    @henrymercer
    henrymercer committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    4e5f9c0 View commit details
    Browse the repository at this point in the history

  3. Add e2e test for rolling back build mode

    @henrymercer
    henrymercer committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    65853b9 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2024

  1. Update changelog and version after v3.24.1

    @github-actions
    github-actions[bot] committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    db663b2 View commit details
    Browse the repository at this point in the history

  2. Update checked-in dependencies

    @github-actions
    github-actions[bot] committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    cf10f87 View commit details
    Browse the repository at this point in the history

  3. Remove some inadvertently checked in build files

    @henrymercer
    henrymercer committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    3935424 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2134 from github/henrymercer/remove-junk 

    Remove some inadvertently checked in build files
    @henrymercer
    henrymercer authored Feb 13, 2024
    Configuration menu
    Copy the full SHA
    057a9cb View commit details
    Browse the repository at this point in the history

  5. Store generated config file in temporary directory 

    This prevents it from becoming part of the analysis.
    @henrymercer
    henrymercer committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    191f59f View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2132 from github/mergeback/v3.24.1-to-main-e675ced7 

    Mergeback v3.24.1 refs/heads/releases/v3 into main
    @dbartol
    dbartol authored Feb 13, 2024
    Configuration menu
    Copy the full SHA
    ecdd69d View commit details
    Browse the repository at this point in the history

  7. Merge pull request #2135 from github/henrymercer/no-analyze-config 

    Avoid analyzing generated configuration file
    @henrymercer
    henrymercer authored Feb 13, 2024
    Configuration menu
    Copy the full SHA
    bc64d12 View commit details
    Browse the repository at this point in the history

  8. Add backticks around branch

    @jsoref
    jsoref committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    427cfbe View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. Add common CLI configuration error categories (#2130) 

    Co-authored-by: Henry Mercer <henry@henrymercer.name>
    @angelapwen @henrymercer
    angelapwen and henrymercer authored Feb 14, 2024
    Configuration menu
    Copy the full SHA
    7b30fef View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2138 from jsoref/update-release-branch-backticks-… 

    …for-branch

Add backticks around branch in update-release-branch PR template
    @henrymercer
    henrymercer authored Feb 14, 2024
    Configuration menu
    Copy the full SHA
    c6cf6fd View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into henrymercer/java-buildless-rollback

    @henrymercer
    henrymercer committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    eb60ca2 View commit details
    Browse the repository at this point in the history

  4. Teach rebuild Action how to resolve conflicts in lib

    @henrymercer
    henrymercer committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    729def5 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #2140 from github/henrymercer/rebuild-resolve-conf… 

    …licts

Teach rebuild Action how to resolve conflicts in lib
    @henrymercer
    henrymercer authored Feb 14, 2024
    Configuration menu
    Copy the full SHA
    d57cf8e View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2129 from github/henrymercer/java-buildless-rollback 

     Introduce a rollback mechanism for Java buildless
    @henrymercer
    henrymercer authored Feb 14, 2024
    Configuration menu
    Copy the full SHA
    95d258a View commit details
    Browse the repository at this point in the history

  7. Deprecate fine-grained parallelism feature-flag

    @nickrolfe
    nickrolfe committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    f00392e View commit details
    Browse the repository at this point in the history

  8. Merge pull request #2141 from github/nickrolfe/deprecate-ff 

    Deprecate fine-grained parallelism feature-flag
    @nickrolfe
    nickrolfe authored Feb 14, 2024
    Configuration menu
    Copy the full SHA
    1a41e55 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. Update changelog for v3.24.2

    @github-actions
    github-actions[bot] committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    663c150 View commit details
    Browse the repository at this point in the history

  2. Add changelog note for #2141 

    Co-authored-by: Henry Mercer <henrymercer@github.com>
    @angelapwen @henrymercer
    angelapwen and henrymercer authored Feb 15, 2024
    Configuration menu
    Copy the full SHA
    32f8d53 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2142 from github/update-v3.24.2-1a41e5519 

    Merge main into releases/v3
    @angelapwen
    angelapwen authored Feb 15, 2024
    Configuration menu
    Copy the full SHA
    ece8414 View commit details
    Browse the repository at this point in the history

  4. Revert "Update version and changelog for v2.24.1" 

    This reverts commit d8c4c3a.
    @henrymercer
    henrymercer committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    10746dd View commit details
    Browse the repository at this point in the history

  5. Revert "Update checked-in dependencies" 

    This reverts commit 05d809f.
    @henrymercer
    henrymercer committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    40cd785 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/releases/v3' into backport-v2.24… 

    ….2-ece8414c7
    @henrymercer
    henrymercer committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    3dafabe View commit details
    Browse the repository at this point in the history

  7. Update version and changelog for v2.24.2

    @henrymercer
    henrymercer committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    0202233 View commit details
    Browse the repository at this point in the history

  8. Update checked-in dependencies

    @github-actions
    github-actions[bot] committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    4f50fb3 View commit details
    Browse the repository at this point in the history

  9. Remove duplicate changelog entry

    @henrymercer
    henrymercer committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    2ccdcd5 View commit details
    Browse the repository at this point in the history