Skip to content

Commit 1db5838

Browse files
committed
Fix build
1 parent 0f46b91 commit 1db5838

File tree

3 files changed

+18
-25
lines changed

3 files changed

+18
-25
lines changed

.github/workflows/build.yml

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
pluginVerifierHomeDir: ${{ steps.properties.outputs.pluginVerifierHomeDir }}
3737
steps:
3838

39-
# Check out current repository
39+
# Check out the current repository
4040
- name: Fetch Sources
4141
uses: actions/checkout@v4
4242

@@ -53,9 +53,7 @@ jobs:
5353

5454
# Setup Gradle
5555
- name: Setup Gradle
56-
uses: gradle/actions/setup-gradle@v3
57-
with:
58-
gradle-home-cache-cleanup: true
56+
uses: gradle/actions/setup-gradle@v4
5957

6058
# Set environment variables
6159
- name: Export Properties
@@ -73,8 +71,6 @@ jobs:
7371
echo "$CHANGELOG" >> $GITHUB_OUTPUT
7472
echo "EOF" >> $GITHUB_OUTPUT
7573
76-
./gradlew listProductsReleases # prepare list of IDEs for Plugin Verifier
77-
7874
# Build plugin
7975
- name: Build plugin
8076
run: ./gradlew buildPlugin
@@ -104,7 +100,7 @@ jobs:
104100
runs-on: ubuntu-latest
105101
steps:
106102

107-
# Check out current repository
103+
# Check out the current repository
108104
- name: Fetch Sources
109105
uses: actions/checkout@v4
110106

@@ -117,9 +113,7 @@ jobs:
117113

118114
# Setup Gradle
119115
- name: Setup Gradle
120-
uses: gradle/actions/setup-gradle@v3
121-
with:
122-
gradle-home-cache-cleanup: true
116+
uses: gradle/actions/setup-gradle@v4
123117

124118
# Run tests
125119
- name: Run Tests
@@ -157,9 +151,12 @@ jobs:
157151
tool-cache: false
158152
large-packages: false
159153

160-
# Check out current repository
154+
# Check out the current repository
161155
- name: Fetch Sources
162156
uses: actions/checkout@v4
157+
with:
158+
ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit
159+
fetch-depth: 0 # a full history is required for pull request analysis
163160

164161
# Set up Java environment for the next steps
165162
- name: Setup Java
@@ -170,7 +167,7 @@ jobs:
170167

171168
# Run Qodana inspections
172169
- name: Qodana - Code Inspection
173-
uses: JetBrains/qodana-action@v2024.1.5
170+
uses: JetBrains/qodana-action@v2024.2
174171
with:
175172
cache-default-branch-only: true
176173

@@ -188,7 +185,7 @@ jobs:
188185
tool-cache: false
189186
large-packages: false
190187

191-
# Check out current repository
188+
# Check out the current repository
192189
- name: Fetch Sources
193190
uses: actions/checkout@v4
194191

@@ -201,9 +198,7 @@ jobs:
201198

202199
# Setup Gradle
203200
- name: Setup Gradle
204-
uses: gradle/actions/setup-gradle@v3
205-
with:
206-
gradle-home-cache-cleanup: true
201+
uses: gradle/actions/setup-gradle@v4
207202

208203
# Cache Plugin Verifier IDEs
209204
- name: Setup Plugin Verifier IDEs Cache
@@ -214,7 +209,7 @@ jobs:
214209

215210
# Run Verify Plugin task and IntelliJ Plugin Verifier tool
216211
- name: Run Plugin Verification tasks
217-
run: ./gradlew runPluginVerifier -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }}
212+
run: ./gradlew verifyPlugin -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }}
218213

219214
# Collect Plugin Verifier Result
220215
- name: Collect Plugin Verifier Result
@@ -235,7 +230,7 @@ jobs:
235230
contents: write
236231
steps:
237232

238-
# Check out current repository
233+
# Check out the current repository
239234
- name: Fetch Sources
240235
uses: actions/checkout@v4
241236

@@ -259,4 +254,4 @@ jobs:
259254
--notes "$(cat << 'EOM'
260255
${{ needs.build.outputs.changelog }}
261256
EOM
262-
)"
257+
)"

.github/workflows/release.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
pull-requests: write
1919
steps:
2020

21-
# Check out current repository
21+
# Check out the current repository
2222
- name: Fetch Sources
2323
uses: actions/checkout@v4
2424
with:
@@ -33,9 +33,7 @@ jobs:
3333

3434
# Setup Gradle
3535
- name: Setup Gradle
36-
uses: gradle/actions/setup-gradle@v3
37-
with:
38-
gradle-home-cache-cleanup: true
36+
uses: gradle/actions/setup-gradle@v4
3937

4038
# Set environment variables
4139
- name: Export Properties
@@ -51,7 +49,7 @@ jobs:
5149
echo "$CHANGELOG" >> $GITHUB_OUTPUT
5250
echo "EOF" >> $GITHUB_OUTPUT
5351
54-
# Update Unreleased section with the current release note
52+
# Update the Unreleased section with the current release note
5553
- name: Patch Changelog
5654
if: ${{ steps.properties.outputs.changelog != '' }}
5755
env:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)