Skip to content

Commit

Permalink
Merge pull request #879 from citizenmatt/feature/gradle-intellij-plug…
Browse files Browse the repository at this point in the history
…in-v2

Migrate to IntelliJ Platform Gradle Plugin 2.0
  • Loading branch information
AlexPl292 authored Jun 21, 2024
2 parents a7814e6 + 28aa156 commit 86bbb28
Show file tree
Hide file tree
Showing 16 changed files with 275 additions and 195 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/runUiOctopusTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Run Idea
run: |
mkdir -p build/reports
gradle runIdeForUiTests -Doctopus.handler=false > build/reports/idea.log &
gradle testIdeUi -Doctopus.handler=false > build/reports/idea.log &
- name: Wait for Idea started
uses: jtalk/url-health-check-action@v3
with:
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
# export DISPLAY=:99.0
# Xvfb -ac :99 -screen 0 1920x1080x16 &
# mkdir -p build/reports
# gradle :runIdeForUiTests #> build/reports/idea.log
# gradle :testIdeUi #> build/reports/idea.log
# - name: Wait for Idea started
# uses: jtalk/[email protected]
# with:
Expand All @@ -78,4 +78,4 @@ jobs:
# with:
# name: ui-test-fails-report-linux
# path: |
# ui-test-example/build/reports
# ui-test-example/build/reports
4 changes: 2 additions & 2 deletions .github/workflows/runUiPyTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Run Idea
run: |
mkdir -p build/reports
gradle :runIdeForUiTests -PideaType=PC > build/reports/idea.log &
gradle :testIdeUi -PideaType=PC > build/reports/idea.log &
- name: Wait for Idea started
uses: jtalk/url-health-check-action@v3
with:
Expand All @@ -49,4 +49,4 @@ jobs:
path: |
build/reports
tests/ui-py-tests/build/reports
sandbox-idea-log
sandbox-idea-log
6 changes: 3 additions & 3 deletions .github/workflows/runUiTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Run Idea
run: |
mkdir -p build/reports
gradle runIdeForUiTests > build/reports/idea.log &
gradle testIdeUi > build/reports/idea.log &
- name: Wait for Idea started
uses: jtalk/url-health-check-action@v3
with:
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
# export DISPLAY=:99.0
# Xvfb -ac :99 -screen 0 1920x1080x16 &
# mkdir -p build/reports
# gradle :runIdeForUiTests #> build/reports/idea.log
# gradle :testIdeUi #> build/reports/idea.log
# - name: Wait for Idea started
# uses: jtalk/[email protected]
# with:
Expand All @@ -78,4 +78,4 @@ jobs:
# with:
# name: ui-test-fails-report-linux
# path: |
# ui-test-example/build/reports
# ui-test-example/build/reports
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
*.swp
/.gradle/
/.intellijPlatform/

/.idea/
!/.idea/scopes
Expand Down
3 changes: 2 additions & 1 deletion .idea/runConfigurations/IdeaVim_full_verification.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions .idea/runConfigurations/Start_IJ_with_IdeaVim__Split_Mode_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .teamcity/_Self/buildTypes/PluginVerifier.kt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ object PluginVerifier : IdeaVimBuildType({

steps {
gradle {
tasks = "clean runPluginVerifier"
tasks = "clean verifyPlugin"
buildFile = ""
enableStacktrace = true
}
Expand Down
Loading

0 comments on commit 86bbb28

Please sign in to comment.