Skip to content

Fix incompatible merge into main #1304

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

Closed
wants to merge 1 commit into from
Closed

Fix incompatible merge into main #1304

wants to merge 1 commit into from

Conversation

aeisenberg
Copy link
Contributor

This PR fixes up a squash that was making merging back into main difficult.

Steps taken to create this PR:

git checkout releases/v2
git revert 807578363a7869ca324a79039e6db9c843e0e100 # The merge commit that can't be merged into main
git merge main

After this PR is merged into releases/v2, you can restart the release process.

Co-authored-by: GitHub [email protected]

  • TRAP Caching: Add timeouts to upload/download operations

  • Add logging statements declaring state of the cli_config_file_enabled

It's possible to determine this otherwise, but this makes it easier to spot.

  • Avoid using single value as array

The user config parser in the CLI doesn't yet support it.

Co-authored-by: Henry Mercer [email protected]

  • Update CHANGELOG.md

Co-authored-by: Andrew Eisenberg [email protected]

  • Tweaks from PR review

Co-authored-by: Henry Mercer [email protected]
Co-authored-by: Andrew Eisenberg [email protected]

  • Update changelog for v2.1.27

Co-authored-by: github-actions[bot] [email protected]
Co-authored-by: Chuan-kai Lin [email protected]
Co-authored-by: Angela P Wen [email protected]
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub [email protected]
Co-authored-by: Edoardo Pirovano [email protected]
Co-authored-by: Edoardo Pirovano [email protected]
Co-authored-by: Andrew Eisenberg [email protected]
Co-authored-by: Henry Mercer [email protected]

Merge / deployment checklist

  • Confirm this change is backwards compatible with existing workflows.
  • Confirm the readme has been updated if necessary.
  • Confirm the changelog has been updated if necessary.

* Update changelog and version after v2.1.26

* Update checked-in dependencies

* Don't check for Go logs on failure (#1279)

* Update supported GitHub Enterprise Server versions. (#1275)

Co-authored-by: GitHub <[email protected]>

* TRAP Caching: Add timeouts to upload/download operations

* Add logging statements declaring state of the cli_config_file_enabled

It's possible to determine this otherwise, but this makes it easier to
spot.

* Avoid using single value as array

The user config parser in the CLI doesn't yet support it.

* Extract logging statements to separate function

* Correctly report CodeQL version when using cache (#1259)

* Correctly report CodeQL version when using cache

* Add JS generated files

* Add test for return value of `setupCodeQL`

* Fill in missing return value comment

* Convert "Invalid source root" errors to UserErrors

* Add changelog note for Go extraction reconciliation (#1286)

* Add changelog note for Go extraction reconciliation

* Update CHANGELOG.md

Co-authored-by: Henry Mercer <[email protected]>

* Update CHANGELOG.md

Co-authored-by: Andrew Eisenberg <[email protected]>

* Tweaks from PR review

Co-authored-by: Henry Mercer <[email protected]>
Co-authored-by: Andrew Eisenberg <[email protected]>

* Update changelog for v2.1.27

Co-authored-by: github-actions[bot] <[email protected]>
Co-authored-by: Chuan-kai Lin <[email protected]>
Co-authored-by: Angela P Wen <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub <[email protected]>
Co-authored-by: Edoardo Pirovano <[email protected]>
Co-authored-by: Edoardo Pirovano <[email protected]>
Co-authored-by: Andrew Eisenberg <[email protected]>
Co-authored-by: Henry Mercer <[email protected]>
@aeisenberg aeisenberg requested a review from a team as a code owner October 14, 2022 23:19
@aeisenberg aeisenberg mentioned this pull request Oct 14, 2022
7 tasks
@aeisenberg aeisenberg changed the title Merge main into releases/v2 (#1287) Fix incompatible merge into main Oct 14, 2022
@aeisenberg aeisenberg closed this Oct 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant