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

fix: Sync failure after non-fatal bazel failure #7119

Conversation

tpasternak
Copy link
Contributor

Checklist

  • I have filed an issue about this change and discussed potential changes with the maintainers.
  • I have received the approval from the maintainers to make this change.
  • This is not a stylistic, refactoring, or cleanup change.

Please note that the maintainers will not be reviewing this change until all checkboxes are ticked. See
the Contributions section in the README for more
details.

Discussion thread for this change

Issue number: <please reference the issue number or url here>

Description of this change

@github-actions github-actions bot added product: CLion CLion plugin product: IntelliJ IntelliJ plugin product: GoLand GoLand plugin awaiting-review Awaiting review from Bazel team on PRs labels Dec 5, 2024
@tpasternak
Copy link
Contributor Author

Probably related to #7117 and #7041

@tpasternak
Copy link
Contributor Author

PTAL what happens latere with this data

// If there was a partial error, make a best-effort attempt to sync. Retain
// any old state that we have in an attempt not to lose too much code.
if (buildResult.getBuildResult().buildResult.status == BuildResult.Status.BUILD_ERROR
|| buildResult.getBuildResult().buildResult.status == Status.FATAL_ERROR) {
mergeWithOldState = true;
}

@tpasternak tpasternak merged commit d34e1ff into bazelbuild:master Dec 5, 2024
7 checks passed
@tpasternak tpasternak deleted the fix-sync-failure-after-non-fatal-bazel-error branch December 5, 2024 11:22
@github-actions github-actions bot removed the awaiting-review Awaiting review from Bazel team on PRs label Dec 5, 2024
tpasternak pushed a commit to tpasternak/bazel-intellij that referenced this pull request Dec 6, 2024
tpasternak pushed a commit to tpasternak/bazel-intellij that referenced this pull request Dec 6, 2024
mai93 added a commit that referenced this pull request Dec 6, 2024
* fix: Sync failure after non-fatal bazel failure (#7119)

* Fix reading of _kt_toolchain attribute (#7115)

Fixes #7114.

rules_kotlin has moved to using a special _kt_toolchain attribute, but it looks like the plugin is unable to properly read them.
This commit fixes the output group `intellij-info-kt` (instead of `intellij-info-kotlin`) and adds rule kinds so that the plugin
recognizes the toolchain.

Change-Id: Iee168c264e81c17ffbb509045275faf0a88e1b72

* fix: Kotlin toolchain detection (#7122)

It has been accidentally removed here
a88c6db#diff-7e834e0a725805ad4dfd127ba905e50964c78307ddb756da99d15a0a1ea28a46L1117-R1124

* doc: Update changelog for hotfix

* Update CHANGELOG

---------

Co-authored-by: Jack Dai <[email protected]>
Co-authored-by: Mai Hussien <[email protected]>
mai93 added a commit that referenced this pull request Dec 6, 2024
* fix: Sync failure after non-fatal bazel failure (#7119)

* Fix reading of _kt_toolchain attribute (#7115)

Fixes #7114.

rules_kotlin has moved to using a special _kt_toolchain attribute, but it looks like the plugin is unable to properly read them.
This commit fixes the output group `intellij-info-kt` (instead of `intellij-info-kotlin`) and adds rule kinds so that the plugin
recognizes the toolchain.

Change-Id: Iee168c264e81c17ffbb509045275faf0a88e1b72

* fix: Kotlin toolchain detection (#7122)

It has been accidentally removed here
a88c6db#diff-7e834e0a725805ad4dfd127ba905e50964c78307ddb756da99d15a0a1ea28a46L1117-R1124

* doc: Update changelog for hotfix

* Update CHANGELOG

---------

Co-authored-by: Jack Dai <[email protected]>
Co-authored-by: Mai Hussien <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
product: CLion CLion plugin product: GoLand GoLand plugin product: IntelliJ IntelliJ plugin
Projects
Development

Successfully merging this pull request may close these issues.

4 participants