[pull] main from bazelbuild:master

.bazelci/android-studio.yml

@@ -2,7 +2,7 @@
 tasks:
   Android-Studio-internal-stable:
     name: Android Studio Internal Stable
-    platform: ubuntu1804
+    platform: ubuntu2204
     build_flags:
       - --define=ij_product=android-studio-latest
     build_targets:
@@ -14,7 +14,7 @@ tasks:
       - //:aswb_tests
   Android-Studio-internal-beta:
     name: Android Studio Internal Beta
-    platform: ubuntu1804
+    platform: ubuntu2204
     build_flags:
       - --define=ij_product=android-studio-beta
     build_targets:
@@ -26,7 +26,7 @@ tasks:
       - //:aswb_tests
   Android-Studio-internal-canary:
     name: Android Studio Internal Canary
-    platform: ubuntu1804
+    platform: ubuntu2204
     build_flags:
       - --define=ij_product=android-studio-canary
     build_targets:
@@ -40,7 +40,7 @@ tasks:
       - exit_status: 1
   Android-Studio-OSS-oldest-stable:
     name: Android Studio OSS Oldest Stable
-    platform: ubuntu1804
+    platform: ubuntu2204
     build_flags:
       - --define=ij_product=android-studio-oss-oldest-stable
     build_targets:
@@ -52,7 +52,7 @@ tasks:
       - //:aswb_tests
   Android-Studio-OSS-latest-stable:
     name: Android Studio OSS Latest Stable
-    platform: ubuntu1804
+    platform: ubuntu2204
     build_flags:
       - --define=ij_product=android-studio-oss-latest-stable
     build_targets:
@@ -64,7 +64,7 @@ tasks:
       - //:aswb_tests
   Android-Studio-OSS-under-dev:
     name: Android Studio OSS Under Development
-    platform: ubuntu1804
+    platform: ubuntu2204
     build_flags:
       - --define=ij_product=android-studio-oss-under-dev
     build_targets:

.bazelci/aspect.yml

@@ -1,52 +1,8 @@
 ---
 tasks:
-  Aspect-internal-stable:
-    name: Aspect Tests for IJ Internal Stable
-    platform: ubuntu1804
-    build_flags:
-      - --define=ij_product=intellij-latest
-    build_targets:
-      - //aspect:aspect_files
-    test_flags:
-      - --define=ij_product=intellij-latest
-      - --test_output=errors
-      - --notrim_test_configuration
-    test_targets:
-      - //aspect/testing/...
-    skip_use_bazel_version_for_test: true
-  Aspect-internal-beta:
-    name: Aspect Tests for IJ Internal Beta
-    platform: ubuntu1804
-    build_flags:
-      - --define=ij_product=intellij-beta
-    build_targets:
-      - //aspect:aspect_files
-    test_flags:
-      - --define=ij_product=intellij-beta
-      - --test_output=errors
-      - --notrim_test_configuration
-    test_targets:
-      - //aspect/testing/...
-    skip_use_bazel_version_for_test: true
-  Aspect-internal-under-dev:
-    name: Aspect Tests for IJ Internal Under Development
-    platform: ubuntu1804
-    build_flags:
-      - --define=ij_product=intellij-under-dev
-    build_targets:
-      - //aspect:aspect_files
-    test_flags:
-      - --define=ij_product=intellij-under-dev
-      - --test_output=errors
-      - --notrim_test_configuration
-    test_targets:
-      - //aspect/testing/...
-    soft_fail:
-      - exit_status: 1
-    skip_use_bazel_version_for_test: true
-  Aspect-oss-oldest-stable:
+  Aspect-OSS-oldest-stable:
     name: Aspect Tests for IJ OSS Oldest Stable
-    platform: ubuntu1804
+    platform: ubuntu2204
     build_flags:
       - --define=ij_product=intellij-oss-oldest-stable
     build_targets:
@@ -58,9 +14,9 @@ tasks:
     test_targets:
       - //aspect/testing/...
     skip_use_bazel_version_for_test: true
-  Aspect-oss-latest-stable:
+  Aspect-OSS-latest-stable:
     name: Aspect Tests for IJ OSS Latest Stable
-    platform: ubuntu1804
+    platform: ubuntu2204
     build_flags:
       - --define=ij_product=intellij-oss-latest-stable
     build_targets:
@@ -72,9 +28,9 @@ tasks:
     test_targets:
       - //aspect/testing/...
     skip_use_bazel_version_for_test: true
-  Aspect-oss-under-dev:
+  Aspect-OSS-under-dev:
     name: Aspect Tests for IJ OSS Under Development
-    platform: ubuntu1804
+    platform: ubuntu2204
     build_flags:
       - --define=ij_product=intellij-oss-under-dev
     build_targets:

.bazelci/clion.yml

@@ -1,74 +1,121 @@
 ---
 tasks:
-  CLion-internal-stable:
-    name: CLion Internal Stable
-    platform: ubuntu1804
+  CLion-Linux-OSS-oldest-stable:
+    name: CLion Linux OSS Oldest Stable
+    platform: ubuntu2204
     build_flags:
-      - --define=ij_product=clion-latest
+      - --define=ij_product=clion-oss-oldest-stable
     build_targets:
-      - //clwb/...
+      - //clwb:clwb_bazel_zip
+      - //:clwb_tests
     test_flags:
-      - --define=ij_product=clion-latest
+      - --define=ij_product=clion-oss-oldest-stable
       - --test_output=errors
     test_targets:
       - //:clwb_tests
-  CLion-internal-beta:
-    name: CLion Internal Beta
-    platform: ubuntu1804
+  CLion-Linux-OSS-latest-stable:
+    name: CLion Linux OSS Latest Stable
+    platform: ubuntu2204
     build_flags:
-      - --define=ij_product=clion-beta
+      - --define=ij_product=clion-oss-latest-stable
     build_targets:
-      - //clwb/...
+      - //clwb:clwb_bazel_zip
+      - //:clwb_tests
     test_flags:
-      - --define=ij_product=clion-beta
+      - --define=ij_product=clion-oss-latest-stable
       - --test_output=errors
     test_targets:
       - //:clwb_tests
-  CLion-internal-under-dev:
-    name: CLion Internal Under Development
-    platform: ubuntu1804
+  CLion-Windows-OSS-oldest-stable:
+    name: CLion Windows OSS Oldest Stable
+    platform: windows
     build_flags:
-      - --define=ij_product=clion-under-dev
+      - --define=ij_product=clion-oss-oldest-stable
     build_targets:
-      - //clwb/...
+      - //clwb:clwb_bazel_zip
+      - //:clwb_tests
     test_flags:
-      - --define=ij_product=clion-under-dev
+      - --define=ij_product=clion-oss-oldest-stable
       - --test_output=errors
     test_targets:
+      - //clwb:integration_tests
+  CLion-Windows-OSS-latest-stable:
+    name: CLion Windows OSS Latest Stable
+    platform: windows
+    build_flags:
+      - --define=ij_product=clion-oss-latest-stable
+    build_targets:
+      - //clwb:clwb_bazel_zip
       - //:clwb_tests
-    soft_fail:
-      - exit_status: 1
-  CLion-OSS-oldest-stable:
-    name: CLion OSS Oldest Stable
-    platform: ubuntu1804
+    test_flags:
+      - --define=ij_product=clion-oss-latest-stable
+      - --test_output=errors
+    test_targets:
+      - //clwb:integration_tests
+  CLion-MacOS-OSS-oldest-stable:
+    name: CLion MacOS OSS Oldest Stable
+    platform: macos_arm64
     build_flags:
       - --define=ij_product=clion-oss-oldest-stable
     build_targets:
-      - //clwb/...
+      - //clwb:clwb_bazel_zip
+      - //:clwb_tests
     test_flags:
       - --define=ij_product=clion-oss-oldest-stable
       - --test_output=errors
     test_targets:
       - //:clwb_tests
-  CLion-OSS-latest-stable:
-    name: CLion OSS Latest Stable
-    platform: ubuntu1804
+  CLion-MacOS-OSS-latest-stable:
+    name: CLion MacOS OSS Latest Stable
+    platform: macos_arm64
     build_flags:
       - --define=ij_product=clion-oss-latest-stable
     build_targets:
-      - //clwb/...
+      - //clwb:clwb_bazel_zip
+      - //:clwb_tests
     test_flags:
       - --define=ij_product=clion-oss-latest-stable
       - --test_output=errors
     test_targets:
       - //:clwb_tests
-  CLion-OSS-under-dev:
-    name: CLion OSS Under Development
-    platform: ubuntu1804
+  CLion-Linux-OSS-under-dev:
+    name: CLion Linux OSS Under Development
+    platform: ubuntu2204
+    build_flags:
+      - --define=ij_product=clion-oss-under-dev
+    build_targets:
+      - //clwb:clwb_bazel_zip
+      - //:clwb_tests
+    test_flags:
+      - --define=ij_product=clion-oss-under-dev
+      - --test_output=errors
+    test_targets:
+      - //:clwb_tests
+    soft_fail:
+      - exit_status: 1
+  CLion-Windows-OSS-under-dev:
+    name: CLion Windows OSS Under Development
+    platform: windows
     build_flags:
       - --define=ij_product=clion-oss-under-dev
     build_targets:
-      - //clwb/...
+      - //clwb:clwb_bazel_zip
+      - //:clwb_tests
+    test_flags:
+      - --define=ij_product=clion-oss-under-dev
+      - --test_output=errors
+    test_targets:
+      - //clwb:integration_tests
+    soft_fail:
+      - exit_status: 1
+  CLion-MacOS-OSS-under-dev:
+    name: CLion MacOS OSS Under Development
+    platform: macos_arm64
+    build_flags:
+      - --define=ij_product=clion-oss-under-dev
+    build_targets:
+      - //clwb:clwb_bazel_zip
+      - //:clwb_tests
     test_flags:
       - --define=ij_product=clion-oss-under-dev
       - --test_output=errors

.bazelci/intellij-ue.yml

@@ -1,46 +1,8 @@
 ---
 tasks:
-  IntelliJ-UE-internal-stable:
-    name: IntelliJ UE Internal Stable
-    platform: ubuntu1804
-    build_flags:
-      - --define=ij_product=intellij-ue-latest
-    build_targets:
-      - //ijwb/...
-    test_flags:
-      - --define=ij_product=intellij-ue-latest
-      - --test_output=errors
-    test_targets:
-      - //:ijwb_ue_tests
-  IntelliJ-UE-internal-beta:
-    name: IntelliJ UE Internal Beta
-    platform: ubuntu1804
-    build_flags:
-      - --define=ij_product=intellij-ue-beta
-    build_targets:
-      - //ijwb/...
-    test_flags:
-      - --define=ij_product=intellij-ue-beta
-      - --test_output=errors
-    test_targets:
-      - //:ijwb_ue_tests
-  IntelliJ-UE-internal-under-dev:
-    name: IntelliJ UE Internal Under Development
-    platform: ubuntu1804
-    build_flags:
-      - --define=ij_product=intellij-ue-under-dev
-    build_targets:
-      - //ijwb/...
-    test_flags:
-      - --define=ij_product=intellij-ue-under-dev
-      - --test_output=errors
-    test_targets:
-      - //:ijwb_ue_tests
-    soft_fail:
-      - exit_status: 1
   IntelliJ-UE-OSS-oldest-stable:
     name: IntelliJ UE OSS Oldest Stable
-    platform: ubuntu1804
+    platform: ubuntu2204
     build_flags:
       - --define=ij_product=intellij-ue-oss-oldest-stable
     build_targets:
@@ -52,7 +14,7 @@ tasks:
       - //:ijwb_ue_tests
   IntelliJ-UE-OSS-latest-stable:
     name: IntelliJ UE OSS Latest Stable
-    platform: ubuntu1804
+    platform: ubuntu2204
     build_flags:
       - --define=ij_product=intellij-ue-oss-latest-stable
     build_targets:
@@ -64,7 +26,7 @@ tasks:
       - //:ijwb_ue_tests
   IntelliJ-UE-OSS-under-dev:
     name: IntelliJ UE OSS Under Development
-    platform: ubuntu1804
+    platform: ubuntu2204
     build_flags:
       - --define=ij_product=intellij-ue-oss-under-dev
     build_targets:
@@ -76,4 +38,24 @@ tasks:
       - //:ijwb_ue_tests
     soft_fail:
       - exit_status: 1
-
+  IntelliJ-UE-OSS-under-dev-windows:
+    name: IntelliJ UE OSS Under Development
+    platform: windows
+    build_flags:
+      - --define=ij_product=intellij-ue-oss-under-dev
+    build_targets:
+      - //ijwb/...
+    soft_fail:
+      - exit_status: 1
+  Querysync:
+    name: Querysync Library
+    platform: ubuntu2204
+    build_flags:
+      - --define=ij_product=intellij-ue-oss-under-dev
+    build_targets:
+      - //querysync/...
+    test_flags:
+      - --define=ij_product=intellij-ue-oss-under-dev
+      - --test_output=errors
+    test_targets:
+      - //querysync/...