[pull] main from bazelbuild:master

.bazelci/aspect.yml

@@ -1,86 +1,42 @@
 ---
 tasks:
-  Aspect-internal-stable:
-    name: Aspect Tests for IJ Internal Stable
-    platform: ubuntu1804
+  Aspect-OSS-oldest-stable:
+    name: Aspect Tests for CLion OSS Oldest Stable
+    platform: ubuntu2204
     build_flags:
-      - --define=ij_product=intellij-latest
+      - --define=ij_product=clion-oss-oldest-stable
     build_targets:
-      - //aspect:aspect_files
+      - //aspect:aspect_lib
     test_flags:
-      - --define=ij_product=intellij-latest
+      - --define=ij_product=clion-oss-oldest-stable
       - --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
+  Aspect-OSS-latest-stable:
+    name: Aspect Tests for CLion OSS Latest Stable
+    platform: ubuntu2204
     build_flags:
-      - --define=ij_product=intellij-beta
+      - --define=ij_product=clion-oss-latest-stable
     build_targets:
-      - //aspect:aspect_files
+      - //aspect:aspect_lib
     test_flags:
-      - --define=ij_product=intellij-beta
+      - --define=ij_product=clion-oss-latest-stable
       - --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
+  Aspect-OSS-under-dev:
+    name: Aspect Tests for CLion OSS Under Development
+    platform: ubuntu2204
     build_flags:
-      - --define=ij_product=intellij-under-dev
+      - --define=ij_product=clion-oss-under-dev
     build_targets:
-      - //aspect:aspect_files
+      - //aspect:aspect_lib
     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:
-    name: Aspect Tests for IJ OSS Oldest Stable
-    platform: ubuntu1804
-    build_flags:
-      - --define=ij_product=intellij-oss-oldest-stable
-    build_targets:
-      - //aspect:aspect_files
-    test_flags:
-      - --define=ij_product=intellij-oss-oldest-stable
-      - --test_output=errors
-      - --notrim_test_configuration
-    test_targets:
-      - //aspect/testing/...
-    skip_use_bazel_version_for_test: true
-  Aspect-oss-latest-stable:
-    name: Aspect Tests for IJ OSS Latest Stable
-    platform: ubuntu1804
-    build_flags:
-      - --define=ij_product=intellij-oss-latest-stable
-    build_targets:
-      - //aspect:aspect_files
-    test_flags:
-      - --define=ij_product=intellij-oss-latest-stable
-      - --test_output=errors
-      - --notrim_test_configuration
-    test_targets:
-      - //aspect/testing/...
-    skip_use_bazel_version_for_test: true
-  Aspect-oss-under-dev:
-    name: Aspect Tests for IJ OSS Under Development
-    platform: ubuntu1804
-    build_flags:
-      - --define=ij_product=intellij-oss-under-dev
-    build_targets:
-      - //aspect:aspect_files
-    test_flags:
-      - --define=ij_product=intellij-oss-under-dev
+      - --define=ij_product=clion-oss-under-dev
       - --test_output=errors
       - --notrim_test_configuration
     test_targets:

.bazelci/clion.yml

@@ -1,78 +1,137 @@
 ---
 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:headless_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:headless_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: false
+  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_bazel_zip
+      - //:clwb_tests
+    test_flags:
+      - --define=ij_product=clion-oss-under-dev
+      - --test_output=errors
+    test_targets:
+      - //clwb:headless_tests
+    soft_fail: false
+  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: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
+    soft_fail: false
+  CLion-last-green:
+    name: CLion Headless Tests Last Green
+    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_tag_filters=bit_bazel_last_green
+    test_targets:
+      - //clwb:all
+    soft_fail: true