Skip to content

Commit acb6b98

Browse files
CopilotMte90
andcommitted
Update CI files to match exact specification
Co-authored-by: Mte90 <403283+Mte90@users.noreply.github.com>
1 parent 777e688 commit acb6b98

File tree

2 files changed

+15
-18
lines changed

2 files changed

+15
-18
lines changed

.github/workflows/kotlin-ci.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "CI — Build Kotlin plugin on PR commits"
1+
name: CI — Build Kotlin plugin on PR commits
22

33
on:
44
pull_request:
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build-kotlin-plugin:
11-
name: "Build (matrix: Java ${{ matrix.java-version }})"
11+
name: Build (matrix: Java ${{ matrix.java-version }})
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
@@ -38,10 +38,9 @@ jobs:
3838
gradle-${{ matrix.java-version }}-
3939
4040
- name: Make wrapper executable
41-
run: chmod +x ide-plugins/gradlew
41+
run: chmod +x ./gradlew
4242

4343
- name: Print Gradle info (for debugging)
44-
working-directory: ide-plugins
4544
run: ./gradlew --no-daemon --version
4645

4746
- name: Run diagnostics script (prints wrapper and kotlin plugin references)
@@ -55,7 +54,6 @@ jobs:
5554
path: out/ci-diagnostics.txt
5655

5756
- name: Full build with stacktrace (capture to file)
58-
working-directory: ide-plugins
5957
env:
6058
GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx3g"
6159
run: |
@@ -65,10 +63,9 @@ jobs:
6563
uses: actions/upload-artifact@v4
6664
with:
6765
name: gradle-build-log
68-
path: ide-plugins/gradle-build.log
66+
path: gradle-build.log
6967

7068
- name: Build Kotlin plugin subproject if present
71-
working-directory: ide-plugins
7269
run: |
7370
set -o pipefail
7471
if ./gradlew :kotlin:tasks --dry-run &>/dev/null; then
@@ -88,6 +85,6 @@ jobs:
8885
with:
8986
name: kotlin-subproject-logs
9087
path: |
91-
ide-plugins/kotlin-subproject-build.log
92-
ide-plugins/assemble.log
88+
kotlin-subproject-build.log
89+
assemble.log
9390
|| true

scripts/ci/inspect_gradle_kotlin_versions.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,38 @@
22
set -eu
33

44
# Print Gradle wrapper distribution URL
5-
if [ -f ide-plugins/gradle/wrapper/gradle-wrapper.properties ]; then
5+
if [ -f gradle/wrapper/gradle-wrapper.properties ]; then
66
echo "== gradle-wrapper.properties =="
7-
grep -i distributionUrl ide-plugins/gradle/wrapper/gradle-wrapper.properties || true
7+
grep -i distributionUrl gradle/wrapper/gradle-wrapper.properties || true
88
echo
99
fi
1010

1111
# Print gradle.properties if present
12-
if [ -f ide-plugins/gradle.properties ]; then
12+
if [ -f gradle.properties ]; then
1313
echo "== gradle.properties =="
14-
cat ide-plugins/gradle.properties || true
14+
cat gradle.properties || true
1515
echo
1616
fi
1717

1818
# Search for Kotlin Gradle plugin references
1919
echo "== Kotlin plugin references (searching for kotlin-gradle-plugin and org.jetbrains.kotlin) =="
20-
grep -R --line-number --color=never "kotlin-gradle-plugin" ide-plugins/ || true
21-
grep -R --line-number --color=never "org.jetbrains.kotlin" ide-plugins/ || true
20+
grep -R --line-number --color=never "kotlin-gradle-plugin" || true
21+
grep -R --line-number --color=never "org.jetbrains.kotlin" || true
2222

2323
# Print build.gradle(.kts) files header lines to show plugin versions where declared
24-
for f in $(git ls-files "ide-plugins/*.gradle" "ide-plugins/*.gradle.kts" 2>/dev/null || true); do
24+
for f in $(git ls-files "*.gradle" "*.gradle.kts" 2>/dev/null || true); do
2525
echo "---- $f ----"
2626
sed -n '1,200p' "$f" | sed -n '1,60p'
2727
echo
2828
done
2929

3030
# Print settings.gradle(.kts)
31-
for f in $(git ls-files "ide-plugins/settings.gradle" "ide-plugins/settings.gradle.kts" 2>/dev/null || true); do
31+
for f in $(git ls-files "settings.gradle" "settings.gradle.kts" 2>/dev/null || true); do
3232
echo "---- $f ----"
3333
sed -n '1,200p' "$f" | sed -n '1,60p'
3434
echo
3535
done
3636

3737
# Print the kotlin plugin versions extracted via a rough regex
3838
echo "== Extracted candidate versions =="
39-
grep -R --line-number --color=never "kotlin-gradle-plugin[:=][^\n]*" ide-plugins/ || true
39+
grep -R --line-number --color=never "kotlin-gradle-plugin[:=][^\n]*" || true

0 commit comments

Comments
 (0)