Skip to content

Commit 1d9e255

Browse files
CopilotMte90
andcommitted
Fix workflow to run gradle from ide-plugins directory
Co-authored-by: Mte90 <403283+Mte90@users.noreply.github.com>
1 parent d0f0cfb commit 1d9e255

File tree

2 files changed

+15
-49
lines changed

2 files changed

+15
-49
lines changed

.github/workflows/kotlin-ci.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,24 @@ jobs:
3232
path: |
3333
~/.gradle/caches
3434
~/.gradle/wrapper
35-
.gradle
36-
key: gradle-${{ matrix.java-version }}-${{ hashFiles('**/*.gradle*','**/gradle-wrapper.properties') }}
35+
ide-plugins/.gradle
36+
key: gradle-${{ matrix.java-version }}-${{ hashFiles('ide-plugins/**/*.gradle*','ide-plugins/**/gradle-wrapper.properties') }}
3737
restore-keys: |
3838
gradle-${{ matrix.java-version }}-
3939
4040
- name: Make wrapper executable
4141
run: chmod +x ./gradlew
42+
working-directory: ide-plugins
4243

4344
- name: Print Gradle info (for debugging)
4445
run: ./gradlew --no-daemon --version
46+
working-directory: ide-plugins
4547

4648
- name: Run diagnostics script (prints wrapper and kotlin plugin references)
4749
run: |
48-
mkdir -p out
49-
scripts/ci/inspect_gradle_kotlin_versions.sh > out/ci-diagnostics.txt || true
50+
mkdir -p ../out
51+
./inspect_gradle_kotlin_versions.sh > ../out/ci-diagnostics.txt || true
52+
working-directory: ide-plugins
5053
- name: Upload diagnostics
5154
uses: actions/upload-artifact@v4
5255
with:
@@ -58,7 +61,8 @@ jobs:
5861
GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx3g"
5962
run: |
6063
set -o pipefail
61-
./gradlew build --no-daemon --stacktrace 2>&1 | tee gradle-build.log || true
64+
./gradlew build --no-daemon --stacktrace 2>&1 | tee ../gradle-build.log || true
65+
working-directory: ide-plugins
6266
- name: Upload build log
6367
uses: actions/upload-artifact@v4
6468
with:
@@ -70,21 +74,22 @@ jobs:
7074
set -o pipefail
7175
if ./gradlew :kotlin:tasks --dry-run &>/dev/null; then
7276
echo "Detected :kotlin subproject -> building it"
73-
./gradlew :kotlin:build --no-daemon --stacktrace 2>&1 | tee kotlin-subproject-build.log || true
77+
./gradlew :kotlin:build --no-daemon --stacktrace 2>&1 | tee ../kotlin-subproject-build.log || true
7478
echo "Uploading kotlin-subproject-build.log"
75-
ls -la kotlin-subproject-build.log || true
79+
ls -la ../kotlin-subproject-build.log || true
7680
elif ./gradlew :plugin:kotlin:tasks --dry-run &>/dev/null; then
7781
echo "Detected :plugin:kotlin subproject -> building it"
78-
./gradlew :plugin:kotlin:build --no-daemon --stacktrace 2>&1 | tee kotlin-subproject-build.log || true
82+
./gradlew :plugin:kotlin:build --no-daemon --stacktrace 2>&1 | tee ../kotlin-subproject-build.log || true
7983
else
8084
echo "No explicit kotlin plugin subproject found; running assemble on all projects"
81-
./gradlew assemble --no-daemon --stacktrace 2>&1 | tee assemble.log || true
85+
./gradlew assemble --no-daemon --stacktrace 2>&1 | tee ../assemble.log || true
8286
fi
87+
working-directory: ide-plugins
8388
- name: Upload kotlin-subproject/build logs if present
8489
uses: actions/upload-artifact@v4
8590
with:
8691
name: kotlin-subproject-logs
8792
path: |
8893
kotlin-subproject-build.log
8994
assemble.log
90-
|| true
95+
if: always()

scripts/ci/inspect_gradle_kotlin_versions.sh

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)