Skip to content

ci: fix 241 integ / 251 ui classpath issues #5502

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Mar 26, 2025
Merged

ci: fix 241 integ / 251 ui classpath issues #5502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
03102c5
ci: fix 241 integ / 251 ui
rli Mar 24, 2025
2aba67c
withVersion
rli Mar 24, 2025
58709f2
Update toolkit-intellij-subplugin.gradle.kts
rli Mar 25, 2025
58d5e10
Merge branch 'main' into rli/fix-ci
rli Mar 25, 2025
dc02f62
swg
rli Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions buildSrc/src/main/kotlin/toolkit-integration-testing.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ extensions.findByType<IntelliJPlatformTestingExtension>()?.let {
task {
integrationTestConfiguration(this)
}

// https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1844
prepareSandboxTask {
disabledPlugins.add("com.intellij.swagger")
}
}
} ?: run {
val integrationTest by tasks.registering(Test::class, integrationTestConfiguration)
Expand Down
4 changes: 3 additions & 1 deletion buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
import org.jetbrains.intellij.platform.gradle.TestFrameworkType
import org.jetbrains.intellij.platform.gradle.tasks.PrepareSandboxTask
import software.aws.toolkits.gradle.findFolders
import software.aws.toolkits.gradle.intellij.IdeVersions
import software.aws.toolkits.gradle.intellij.toolkitIntelliJ
Expand Down Expand Up @@ -103,7 +104,8 @@ dependencies {
}
}

tasks.prepareTestSandbox {
// https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1844
tasks.withType<PrepareSandboxTask>().configureEach {
disabledPlugins.addAll(
"com.intellij.swagger",
"org.jetbrains.plugins.kotlin.jupyter",
Expand Down
2 changes: 2 additions & 0 deletions ui-tests-starter/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
allure-results/
package.json
package-lock.json
4 changes: 4 additions & 0 deletions ui-tests-starter/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
}

val uiTestImplementation by configurations.getting
val uiTestRuntimeOnly by configurations.getting

Check notice on line 41 in ui-tests-starter/build.gradle.kts

View workflow job for this annotation

GitHub Actions / Qodana Community for JVM

Function or property has platform type 

Declaration has type inferred from a platform call, which can lead to unchecked nullability issues. Specify type explicitly as nullable or non-nullable.

Check notice

Code scanning / QDJVMC

Function or property has platform type Note

Declaration has type inferred from a platform call, which can lead to unchecked nullability issues. Specify type explicitly as nullable or non-nullable.

configurations.getByName(uiTestSource.compileClasspathConfigurationName) {
extendsFrom(uiTestImplementation)
Expand All @@ -53,6 +54,9 @@
uiTestImplementation(platform(libs.junit5.bom))
uiTestImplementation(libs.junit5.jupiter)

// not sure why not coming in transitively for starter
uiTestRuntimeOnly(libs.kotlin.coroutines)

intellijPlatform {
val version = ideProfile.community.sdkVersion
intellijIdeaCommunity(version, !version.contains("SNAPSHOT"))
Expand Down
2 changes: 1 addition & 1 deletion ...er/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class OfflineAmazonQInlineCompletionTest {
LocalProjectInfo(
Paths.get("tstData", "Hello")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
Paths.get(System.getProperty("user.home"), ".aws", "sso", "cache", "ee1d2538cb8d358377d7661466c866af747a8a3f.json")
.createParentDirectories()
.writeText(
Expand Down
2 changes: 1 addition & 1 deletion ...sts-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/chatTests/AmazonQChatTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class AmazonQChatTest {
LocalProjectInfo(
Paths.get("tstData", "Hello")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))

// inject connection
useExistingConnectionForTest()
Expand Down
10 changes: 5 additions & 5 deletions ...3+/software/aws/toolkits/jetbrains/uitests/docTests/createReadmeTests/CreateReadmeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class CreateReadmeTest {
LocalProjectInfo(
Paths.get("tstData", "qdoc", "createFlow")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))

// inject connection
useExistingConnectionForTest()
Expand Down Expand Up @@ -101,7 +101,7 @@ class CreateReadmeTest {
LocalProjectInfo(
Paths.get("tstData", "qdoc", "createFlow")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))

// inject connection
useExistingConnectionForTest()
Expand Down Expand Up @@ -137,7 +137,7 @@ class CreateReadmeTest {
LocalProjectInfo(
Paths.get("tstData", "qdoc", "createFlow")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))

// inject connection
useExistingConnectionForTest()
Expand Down Expand Up @@ -173,7 +173,7 @@ class CreateReadmeTest {
LocalProjectInfo(
Paths.get("tstData", "qdoc", "createFlow")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))

// inject connection
useExistingConnectionForTest()
Expand Down Expand Up @@ -218,7 +218,7 @@ class CreateReadmeTest {
LocalProjectInfo(
Paths.get("tstData", "qdoc", "createFlow")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))

// inject connection
useExistingConnectionForTest()
Expand Down
6 changes: 3 additions & 3 deletions ...ws/toolkits/jetbrains/uitests/docTests/updateReadmeTests/UpdateReadmeLatestChangesTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class UpdateReadmeLatestChangesTest {
LocalProjectInfo(
Paths.get("tstData", "qdoc", "updateFlow")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))

// inject connection
useExistingConnectionForTest()
Expand Down Expand Up @@ -101,7 +101,7 @@ class UpdateReadmeLatestChangesTest {
LocalProjectInfo(
Paths.get("tstData", "qdoc", "updateFlow")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))

// inject connection
useExistingConnectionForTest()
Expand Down Expand Up @@ -139,7 +139,7 @@ class UpdateReadmeLatestChangesTest {
LocalProjectInfo(
Paths.get("tstData", "qdoc", "updateFlow")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))

// inject connection
useExistingConnectionForTest()
Expand Down
4 changes: 2 additions & 2 deletions .../toolkits/jetbrains/uitests/docTests/updateReadmeTests/UpdateReadmeSpecificChangesTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class UpdateReadmeSpecificChangesTest {
LocalProjectInfo(
Paths.get("tstData", "qdoc", "updateFlow")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))

// inject connection
useExistingConnectionForTest()
Expand Down Expand Up @@ -100,7 +100,7 @@ class UpdateReadmeSpecificChangesTest {
LocalProjectInfo(
Paths.get("tstData", "qdoc", "updateFlow")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))

// inject connection
useExistingConnectionForTest()
Expand Down
10 changes: 5 additions & 5 deletions ...tarter/tst-243+/software/aws/toolkits/jetbrains/uitests/featureDevTests/FeatureDevTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class FeatureDevTest {
LocalProjectInfo(
Paths.get("tstData", "FeatureDevE2ETestFolder")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))

// inject connection
useExistingConnectionForTest()
Expand Down Expand Up @@ -100,7 +100,7 @@ class FeatureDevTest {
LocalProjectInfo(
Paths.get("tstData", "FeatureDevE2ETestFolder")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))

// inject connection
useExistingConnectionForTest()
Expand Down Expand Up @@ -132,7 +132,7 @@ class FeatureDevTest {
LocalProjectInfo(
Paths.get("tstData", "FeatureDevE2ETestFolder")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))

// inject connection
useExistingConnectionForTest()
Expand Down Expand Up @@ -164,7 +164,7 @@ class FeatureDevTest {
LocalProjectInfo(
Paths.get("tstData", "FeatureDevE2ETestFolder")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))

// inject connection
useExistingConnectionForTest()
Expand Down Expand Up @@ -196,7 +196,7 @@ class FeatureDevTest {
LocalProjectInfo(
Paths.get("tstData", "FeatureDevE2ETestFolder")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))

// inject connection
useExistingConnectionForTest()
Expand Down
8 changes: 4 additions & 4 deletions ...ter/tst-243+/software/aws/toolkits/jetbrains/uitests/testTests/QTestGenerationChatTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class QTestGenerationChatTest {
LocalProjectInfo(
Paths.get("tstData", "qTestGenerationTestProject")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))

// inject connection
useExistingConnectionForTest()
Expand Down Expand Up @@ -89,7 +89,7 @@ class QTestGenerationChatTest {
LocalProjectInfo(
Paths.get("tstData", "qTestGenerationTestProject/")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))

// inject connection
useExistingConnectionForTest()
Expand Down Expand Up @@ -123,7 +123,7 @@ class QTestGenerationChatTest {
LocalProjectInfo(
Paths.get("tstData", "qTestGenerationTestProject/")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))

// inject connection
useExistingConnectionForTest()
Expand Down Expand Up @@ -155,7 +155,7 @@ class QTestGenerationChatTest {
LocalProjectInfo(
Paths.get("tstData", "qTestGenerationTestProject/")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))

// inject connection
useExistingConnectionForTest()
Expand Down
2 changes: 1 addition & 1 deletion ...rter/tst-243+/software/aws/toolkits/jetbrains/uitests/transformTests/TransformChatTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class TransformChatTest {
LocalProjectInfo(
Paths.get("tstData", "Hello")
)
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
).withVersion(System.getProperty("org.gradle.project.ideProfileName"))

// inject connection
useExistingConnectionForTest()
Expand Down
Loading