Merge branch 'master' into include-cache

Author: LeFrosch

.github/workflows/issue-assignee.yml

@@ -20,7 +20,7 @@ jobs:
       issues: write
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Set assignees
         uses: actions/github-script@v7
         with:

.github/workflows/issue-labeler.yml

@@ -17,7 +17,7 @@ jobs:
         template: [ bug_report.yml, feature_request.yml ]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Parse issue form
         uses: stefanbuck/github-issue-parser@2ea9b35a8c584529ed00891a8f7e41dc46d0441e # v3.2.1

.github/workflows/pr-label-and-assignee.yml

@@ -20,7 +20,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Set Assignees
         uses: actions/github-script@v7
         with:

.github/workflows/release.yml

@@ -10,6 +10,10 @@ on:
 
 jobs:
   build:
+    permissions:
+      contents: read
+      actions: write
+
     strategy:
       matrix:
         product: [clion-oss-latest-stable, clion-oss-oldest-stable]
@@ -18,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Bazel
         uses: bazel-contrib/[email protected]
@@ -48,23 +52,27 @@ jobs:
           retention-days: 1
 
   gh-release:
+    permissions:
+      contents: write
+      actions: read
+
     needs: build
 
     runs-on: ubuntu-latest
 
     steps:
       - name: Download Latest Plugin Zip
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: clion-oss-latest-stable
 
       - name: Download Oldest Plugin Zip
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: clion-oss-oldest-stable
 
       - name: Create Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: "*.zip"
           tag_name: ${{ inputs.version }}
@@ -76,18 +84,22 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   jb-release:
+    permissions:
+      contents: none
+      actions: read
+
     needs: build
 
     runs-on: ubuntu-latest
 
     steps:
       - name: Download Latest Plugin Zip
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: clion-oss-latest-stable
 
       - name: Download Oldest Plugin Zip
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: clion-oss-oldest-stable
 

MODULE.bazel

@@ -9,11 +9,11 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_java",
-    version = "8.14.0",
+    version = "8.15.1",
 )
 bazel_dep(
     name = "rules_python",
-    version = "1.5.1",
+    version = "1.6.0",
 )
 
 python = use_extension("@rules_python//python/extensions:python.bzl", "python")
@@ -29,7 +29,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "protobuf",
-    version = "29.5",
+    version = "32.0",
 )
 bazel_dep(
     name = "bazel_skylib",
@@ -62,7 +62,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_cc",
-    version = "0.1.4",
+    version = "0.2.0",
     dev_dependency = True,
 )
 bazel_dep(
@@ -167,8 +167,8 @@ use_repo(
     truth = "com_google_truth_truth",
 )
 
-bazel_dep(name = "rules_go", version = "0.55.1", repo_name = "io_bazel_rules_go")
-bazel_dep(name = "gazelle", version = "0.44.0", repo_name = "bazel_gazelle")
+bazel_dep(name = "rules_go", version = "0.56.1", repo_name = "io_bazel_rules_go")
+bazel_dep(name = "gazelle", version = "0.45.0", repo_name = "bazel_gazelle")
 
 go_repository = use_repo_rule("@bazel_gazelle//:deps.bzl", "go_repository")
 

aspect/testing/tests/src/com/google/idea/blaze/aspect/integration/testdata/WORKSPACE

@@ -11,6 +11,6 @@ http_archive(
 
 http_archive(
     name = "rules_java",
-    sha256 = "0a7e8811cac04b553f6c6c0d185046e3c68a4cb774e83f37a7a5fb6a3deee261",
-    url = "https://github.com/bazelbuild/rules_java/releases/download/8.15.0/rules_java-8.15.0.tar.gz",
+    sha256 = "9b04cbbb0fee0632aeba628159938484cfadf4a9d2f5b1c356e8300c56467896",
+    url = "https://github.com/bazelbuild/rules_java/releases/download/8.15.1/rules_java-8.15.1.tar.gz",
 )

base/src/com/google/idea/blaze/base/buildview/events/AbortedParser.kt

@@ -58,6 +58,7 @@ class AbortedParser : BuildEventParser {
       id.hasConfiguredLabel() -> id.configuredLabel.label
       id.hasPattern() -> id.pattern.patternList.firstOrNull()
       id.hasUnstructuredCommandLine() -> null
+      id.hasBuildFinished() -> null
       else -> reportMissingImplementation(id)
     }
   }

base/src/com/google/idea/blaze/base/sync/SyncPhaseCoordinator.java

@@ -102,6 +102,7 @@
 import java.util.function.Predicate;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.GuardedBy;
+import kotlinx.coroutines.JobCancellationException;
 
 /** Manages sync execution, coordinating the possibly-separate build/update phases. */
 public final class SyncPhaseCoordinator {
@@ -883,6 +884,9 @@ private static void logSyncError(BlazeContext context, Throwable e) {
       if (cause instanceof SyncCanceledException) {
         return;
       }
+      if (cause instanceof JobCancellationException) {
+        return;
+      }
       if (cause instanceof SyncFailedException) {
         if (cause.getMessage() != null) {
           IssueOutput.error(cause.getMessage()).submit(context);

clwb/tests/projects/clang_cl/MODULE.bazel

@@ -1,4 +1,4 @@
-bazel_dep(name = "rules_cc", version = "0.1.4")
+bazel_dep(name = "rules_cc", version = "0.2.0")
 bazel_dep(name = "platforms", version = "1.0.0")
 
 cc_configure = use_extension("@rules_cc//cc:extensions.bzl", "cc_configure_extension")

clwb/tests/projects/external_includes/MODULE.bazel

@@ -1,2 +1,2 @@
-bazel_dep(name = "rules_cc", version = "0.1.4")
+bazel_dep(name = "rules_cc", version = "0.2.0")
 bazel_dep(name = "catch2", version = "3.7.1")