Merge branch 'main' into fix-telemetry-generate-fix

Author: ctlai95

.changes/next-release/bugfix-fef8426e-f36c-425f-af0e-a9811e01e2f5.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Reduce frequency of system information query"
+}

.github/workflows/prerelease.yml

@@ -9,6 +9,9 @@ on:
   push:
     branches: [ main, feature/* ]
 
+concurrency:
+  group: ${{ github.workflow }}${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   generate_artifact_toolkit_standalone:

.github/workflows/q-mega-prerelease.yml

@@ -1,5 +1,6 @@
 .gradle
 .intellijPlatform
+.kotlin
 out/
 target/
 .idea

.gitignore

@@ -34,8 +34,6 @@ dependencies {
     testImplementation(libs.junit4)
     testImplementation(libs.bundles.mockito)
     testImplementation(gradleTestKit())
-
-    testRuntimeOnly(libs.junit5.jupiterVintage)
 }
 
 tasks.test {

buildSrc/build.gradle.kts

@@ -66,3 +66,8 @@ tasks.verifyPlugin {
     // give each instance its own home dir
     systemProperty("plugin.verifier.home.dir", temporaryDir)
 }
+
+val pluginZip by configurations.creating
+artifacts {
+    add("pluginZip", tasks.buildPlugin)
+}

buildSrc/src/main/kotlin/toolkit-publishing-conventions.gradle.kts

@@ -20,10 +20,9 @@ dependencies {
 
     // Everything uses junit4/5 except rider, which uses TestNG
     testFixturesApi(platform(versionCatalog.findLibrary("junit5-bom").get()))
-    testFixturesApi(versionCatalog.findLibrary("junit5-jupiterApi").get())
-    testFixturesApi(versionCatalog.findLibrary("junit5-jupiterParams").get())
+    testFixturesApi(versionCatalog.findLibrary("junit5-jupiter").get())
 
-    testRuntimeOnly(versionCatalog.findLibrary("junit5-jupiterEngine").get())
+    testRuntimeOnly(versionCatalog.findLibrary("junit-platform-launcher").get())
     testRuntimeOnly(versionCatalog.findLibrary("junit5-jupiterVintage").get())
 }
 

buildSrc/src/main/kotlin/toolkit-testing.gradle.kts

@@ -19,7 +19,7 @@ env:
 phases:
   install:
     commands:
-      - dnf install -y marco mate-media
+      - dnf install -y marco mate-media e2fsprogs
       - startDesktop.sh
 
       # login to DockerHub so we don't get throttled
@@ -45,10 +45,9 @@ phases:
         credential_source=EcsContainer"
         
       - chmod +x gradlew
-      - ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME :sandbox-all:prepareTestIdeUiSandbox --console plain --info
 
       - ffmpeg -loglevel quiet -nostdin -f x11grab -video_size ${SCREEN_WIDTH}x${SCREEN_HEIGHT} -i ${DISPLAY} -codec:v libx264 -pix_fmt yuv420p -vf drawtext="fontsize=48:box=1:[email protected]:boxborderw=5:fontcolor=white:x=0:y=h-text_h:text='%{gmtime\:%H\\\\\:%M\\\\\:%S}'" -framerate 12 -g 12 /tmp/screen_recording.mp4 &
-      - ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME uiTestCore coverageReport --console plain --info
+      - ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME :ui-tests-starter:test coverageReport --console plain --info
 
   post_build:
     commands:

buildspec/linuxUiTests.yml

@@ -15,7 +15,6 @@ dependencies {
 
     // only used to make test work
     testRuntimeOnly(libs.slf4j.api)
-    testRuntimeOnly(libs.junit5.jupiterVintage)
 }
 
 tasks.test {

detekt-rules/build.gradle.kts

@@ -8,7 +8,7 @@ toolkitVersion=3.46-SNAPSHOT
 publishToken=
 publishChannel=
 
-ideProfileName=2024.1
+ideProfileName=2024.2
 
 remoteRobotPort=8080