Skip to content

Commit da42f41

Browse files
authored
Merge pull request magento#1439 from magento/5.1.0-pre-release
Updated actions
2 parents b77b3a1 + 4b2ad6d commit da42f41

File tree

5 files changed

+31
-30
lines changed

5 files changed

+31
-30
lines changed

.github/workflows/gradle.yml

+20-12
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616
- name: Set up JDK 11
17-
uses: actions/setup-java@v1
17+
uses: actions/setup-java@v3
1818
with:
1919
java-version: 11
20-
- uses: actions/cache@v2
20+
distribution: 'temurin'
21+
cache: gradle
22+
- uses: actions/cache@v3
2123
with:
2224
path: |
2325
~/.gradle/caches
@@ -36,12 +38,14 @@ jobs:
3638
runs-on: windows-latest
3739

3840
steps:
39-
- uses: actions/checkout@v2
41+
- uses: actions/checkout@v3
4042
- name: Set up JDK 11
41-
uses: actions/setup-java@v1
43+
uses: actions/setup-java@v3
4244
with:
4345
java-version: 11
44-
- uses: actions/cache@v2
46+
distribution: 'temurin'
47+
cache: gradle
48+
- uses: actions/cache@v3
4549
with:
4650
path: |
4751
~/.gradle/caches
@@ -60,12 +64,14 @@ jobs:
6064
runs-on: macos-latest
6165

6266
steps:
63-
- uses: actions/checkout@v2
67+
- uses: actions/checkout@v3
6468
- name: Set up JDK 11
65-
uses: actions/setup-java@v1
69+
uses: actions/setup-java@v3
6670
with:
6771
java-version: 11
68-
- uses: actions/cache@v2
72+
distribution: 'temurin'
73+
cache: gradle
74+
- uses: actions/cache@v3
6975
with:
7076
path: |
7177
~/.gradle/caches
@@ -84,12 +90,14 @@ jobs:
8490
runs-on: ubuntu-latest
8591

8692
steps:
87-
- uses: actions/checkout@v2
93+
- uses: actions/checkout@v3
8894
- name: Set up JDK 11
89-
uses: actions/setup-java@v1
95+
uses: actions/setup-java@v3
9096
with:
9197
java-version: 11
92-
- uses: actions/cache@v2
98+
distribution: 'temurin'
99+
cache: gradle
100+
- uses: actions/cache@v3
93101
with:
94102
path: |
95103
~/.gradle/caches

.github/workflows/gradlepublish.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v3
1616
- name: Set up JDK 11
17-
uses: actions/setup-java@v1
17+
uses: actions/setup-java@v3
1818
with:
1919
java-version: 11
20+
distribution: 'temurin'
21+
cache: gradle
2022
- name: Gradle wrapper
2123
run: gradle wrapper
2224
- name: Grant execute permission for gradlew

.github/workflows/gradlepublishalpha.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
1717
- name: Set up JDK 11
18-
uses: actions/setup-java@v1
18+
uses: actions/setup-java@v3
1919
with:
2020
java-version: 11
21+
distribution: 'temurin'
22+
cache: gradle
2123
- name: Gradle wrapper
2224
run: gradle wrapper
2325
- name: Grant execute permission for gradlew

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
plugins {
7-
id 'org.jetbrains.intellij' version '1.11.0'
7+
id 'org.jetbrains.intellij' version '1.13.2'
88
id 'checkstyle'
99
id 'pmd'
1010
id 'org.jetbrains.changelog' version '2.0.0'

gradle-tasks/staticChecks.gradle

+3-14
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,20 @@ checkstyle {
1313
toolVersion = "8.31"
1414
ignoreFailures = false
1515
maxWarnings = 0
16-
configFile rootProject.file("gradle-tasks/checkstyle/checkstyle.xml")
16+
configFile rootProject.file("${rootDir}/gradle-tasks/checkstyle/checkstyle.xml")
1717
}
1818

1919
pmd {
2020
toolVersion = "6.21.0"
2121
consoleOutput = true
22-
ruleSets = [
23-
rootProject.file("gradle-tasks/pmd/ruleset.xml")
24-
]
22+
ruleSetFiles = files("${rootDir}/gradle-tasks/pmd/ruleset.xml")
23+
ruleSets = []
2524
}
2625

2726
tasks.withType(Checkstyle) {
2827
// Specify all files that should be checked
2928
classpath = files()
3029
source "${project.rootDir}"
31-
32-
reports {
33-
xml.enabled false
34-
html.enabled true
35-
}
3630
}
3731

3832
// Execute Checkstyle on all files
@@ -49,11 +43,6 @@ tasks.withType(Pmd) {
4943
// Specify all files that should be checked
5044
classpath = files()
5145
source "${project.rootDir}"
52-
53-
reports {
54-
xml.enabled false
55-
html.enabled true
56-
}
5746
}
5847

5948
// Execute Checkstyle on all files

0 commit comments

Comments
 (0)