diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 982cab4ee..400673b8c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -36,9 +36,22 @@ jobs: uses: actions/checkout@v3 with: path: liberty-tools-intellij + - name: 'Checkout lsp4ij' + uses: actions/checkout@v3 + with: + repository: redhat-developer/lsp4ij + path: lsp4ij + ref: main - name: 'Install required integration test software' working-directory: ./liberty-tools-intellij run: bash ./src/test/resources/ci/scripts/setup.sh + - name: 'Build Lsp4ij' + working-directory: ./lsp4ij + run: bash ./gradlew buildPlugin + - name: 'Unzip lsp4ij file' + working-directory: ./lsp4ij/build/distributions + run: | + unzip -o '*.zip' -d . - name: 'Build Liberty-Tools-Intellij' working-directory: ./liberty-tools-intellij run: bash ./gradlew buildPlugin diff --git a/build.gradle b/build.gradle index 210761e3b..60f3e5915 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,6 @@ sourceCompatibility = 17 targetCompatibility = 17 def remoteRobotVersion = "0.11.18" -def lsp4ijNightlyVersion = '0.0.1-20240518-012816' repositories { mavenCentral() @@ -140,7 +139,7 @@ intellij { // For a full list of IntelliJ IDEA releases please see https://www.jetbrains.com/intellij-repository/releases version = '2024.1.1' - plugins = ['java', 'maven', 'gradle-java', 'properties', 'terminal', 'org.jetbrains.idea.maven', 'com.intellij.gradle', 'com.redhat.devtools.lsp4ij:' + lsp4ijNightlyVersion + '@nightly'] + plugins = ['java', 'maven', 'gradle-java', 'properties', 'terminal', 'org.jetbrains.idea.maven', 'com.intellij.gradle', file("../lsp4ij/build/distributions/LSP4IJ/")] updateSinceUntilBuild = false }