Skip to content
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

SLI-1565 Verify caching IDE distribution works #1147

Merged
merged 1 commit into from
Aug 29, 2024
Merged

SLI-1565 Verify caching IDE distribution works #1147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
SLACK_TOKEN: VAULT[development/kv/data/slack data.token]
GRADLE_VERSION: "8.9"
GRADLE_USER_HOME: ${CIRRUS_WORKING_DIR}/.gradle_cache
IDEA_HOME: "/opt/intellij"
RIDER_HOME: "/opt/rider"
RESHARPER_HOME: "/opt/resharper"
CLION_HOME: "/opt/clion"

auto_cancellation: $CIRRUS_BRANCH != $CIRRUS_DEFAULT_BRANCH

Expand Down Expand Up @@ -58,11 +62,6 @@
builder_image: docker-builder-v*
builder_instance_type: t3.small
builder_subnet_id: ${CIRRUS_AWS_SUBNET}
env:
IDEA_HOME: /opt/intellij
RIDER_HOME: /opt/rider
RESHARPER_HOME: /opt/resharper
CLION_HOME: /opt/clion

ec2_instance: &WINVM_DEFINITION
experimental: true
Expand Down Expand Up @@ -115,7 +114,7 @@
slack_notification_script: |
.cirrus/slack-notification.sh

validate_task:

Check warning on line 117 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L117 

task "validate" depends on task "build", but their only_if conditions are different
# name: "Run UTs and trigger SonarQube analysis"
depends_on:
- build
Expand All @@ -141,13 +140,17 @@
slack_notification_script: |
.cirrus/slack-notification.sh

validate_windows_task:

Check warning on line 143 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L143 

task "validate_windows" depends on task "build", but their only_if conditions are different
# name: "Run unit tests on Windows"
depends_on:
- build
<<: *ONLY_PR_AND_MAINTAINED_BRANCHES
env:
JDK_VERSION: "17"
IDEA_HOME: ""
RIDER_HOME: ""
RESHARPER_HOME: ""
CLION_HOME: ""
ec2_instance:
<<: *WINVM_DEFINITION
<<: *SETUP_GRADLE_CACHE
Expand Down Expand Up @@ -206,7 +209,7 @@
slack_notification_script: |
.cirrus/slack-notification.sh

qa_task:

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different

Check warning on line 212 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L212 

task "qa" depends on task "build", but their only_if conditions are different
# name: "Run ITs"
depends_on:
- build
Expand Down Expand Up @@ -389,7 +392,7 @@
slack_notification_script: |
.cirrus/slack-notification.sh

inspect_orchestrator_cache_task:

Check warning on line 395 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L395 

task "inspect_orchestrator_cache" depends on task "build", but their only_if conditions are different
<<: *ONLY_PR_AND_MAINTAINED_BRANCHES
depends_on: build
eks_container:
Expand Down Expand Up @@ -429,7 +432,7 @@
slack_notification_script: |
.cirrus/slack-notification.sh

promote_task:

Check warning on line 435 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L435 

task "promote" depends on task "mend_scan", but their only_if conditions are different

Check warning on line 435 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L435 

task "promote" depends on task "build", but their only_if conditions are different
depends_on:
- build
- validate
Expand All @@ -438,12 +441,13 @@
- mend_scan
<<: *ONLY_PR_AND_MAINTAINED_BRANCHES
eks_container:
<<: *CONTAINER_DEFINITION
<<: *BUILDER_CONTAINER_DEFINITION
cpu: 3
memory: 4G
env:
ARTIFACTORY_PROMOTE_ACCESS_TOKEN: VAULT[development/artifactory/token/${CIRRUS_REPO_OWNER}-${CIRRUS_REPO_NAME}-promoter access_token]
GITHUB_TOKEN: VAULT[development/github/token/${CIRRUS_REPO_OWNER}-${CIRRUS_REPO_NAME}-promotion token]
JDK_VERSION: "17"
<<: *SETUP_GRADLE_CACHE
promote_script: |
source .cirrus/use-gradle-wrapper.sh
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ intellij {
pluginName.set("sonarlint-intellij")
updateSinceUntilBuild.set(false)
plugins.set(listOf("java", "Git4Idea"))
if (ideaHome != null) {
if (!ideaHome.isNullOrBlank()) {
localPath.set(ideaHome)
localSourcesPath.set(ideaHome)
} else {
Expand Down
2 changes: 1 addition & 1 deletion clion-common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
}

intellij {
if (resharperHome != null) {
if (!resharperHome.isNullOrBlank()) {
localPath.set(resharperHome)
localSourcesPath.set(resharperHome)
} else {
Expand Down
2 changes: 1 addition & 1 deletion clion-resharper/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ val clionResharperBuildVersion: String by project
val resharperHome: String? = System.getenv("RESHARPER_HOME")

intellij {
if (resharperHome != null) {
if (!resharperHome.isNullOrBlank()) {
localPath.set(resharperHome)
localSourcesPath.set(resharperHome)
} else {
Expand Down
2 changes: 1 addition & 1 deletion clion/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ val clionHome: String? = System.getenv("CLION_HOME")

intellij {
plugins.set(listOf("com.intellij.clion", "com.intellij.cidr.base", "com.intellij.cidr.lang"))
if (clionHome != null) {
if (!clionHome.isNullOrBlank()) {
localPath.set(clionHome)
localSourcesPath.set(clionHome)
} else {
Expand Down
2 changes: 1 addition & 1 deletion common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
}

intellij {
if (ideaHome != null) {
if (!ideaHome.isNullOrBlank()) {
localPath.set(ideaHome)
localSourcesPath.set(ideaHome)
} else {
Expand Down
2 changes: 1 addition & 1 deletion git/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
}

intellij {
if (ideaHome != null) {
if (!ideaHome.isNullOrBlank()) {
localPath.set(ideaHome)
localSourcesPath.set(ideaHome)
} else {
Expand Down
2 changes: 1 addition & 1 deletion rider/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
}

intellij {
if (riderHome != null) {
if (!riderHome.isNullOrBlank()) {
localPath.set(riderHome)
localSourcesPath.set(riderHome)
} else {
Expand Down