Skip to content

Commit 03c67c4

Browse files
hszhsz
committed
GitHub Actions: remove redundant XDG_CACHE_HOME and Java setup
1 parent e0555c2 commit 03c67c4

11 files changed

+15
-102
lines changed

‎.github/workflows/build.yml‎

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,18 @@ name: Build
22
on:
33
# Trigger the workflow on pushes to only the 'master' branch (this avoids duplicate checks being run, e.g. for dependabot pull requests)
44
push:
5-
branches: [master]
6-
paths-ignore: ['**.md', '.teamcity/**']
5+
branches: [ master ]
6+
paths-ignore: [ '**.md', '.teamcity/**' ]
77
# Trigger the workflow on any pull request
88
pull_request:
9-
paths-ignore: ['**.md', '.teamcity/**']
9+
paths-ignore: [ '**.md', '.teamcity/**' ]
1010

1111

1212
# This allows a subsequently queued workflow run to interrupt previous runs
1313
concurrency:
1414
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
1515
cancel-in-progress: true
1616

17-
env:
18-
XDG_CACHE_HOME: "~/.config/"
19-
2017
jobs:
2118

2219
gradleValidation:
@@ -33,12 +30,12 @@ jobs:
3330
needs: [ gradleValidation, unitTests ]
3431
uses: ./.github/workflows/reusable-integrationTests.yml
3532

36-
# integrationTestsEAP:
37-
# name: Integration Tests EAP
38-
# needs: gradleValidation
39-
# uses: ./.github/workflows/reusable-integrationTests.yml
40-
# with:
41-
# platformVersion: 222-EAP-SNAPSHOT
33+
# integrationTestsEAP:
34+
# name: Integration Tests EAP
35+
# needs: gradleValidation
36+
# uses: ./.github/workflows/reusable-integrationTests.yml
37+
# with:
38+
# platformVersion: 222-EAP-SNAPSHOT
4239

4340
codeInspection:
4441
name: Code Inspection
@@ -49,9 +46,9 @@ jobs:
4946
name: Build
5047
needs:
5148
- unitTests
52-
# - integrationTests
53-
# - integrationTestsEAP
54-
# - codeInspection
49+
# - integrationTests
50+
# - integrationTestsEAP
51+
# - codeInspection
5552
runs-on: ubuntu-latest
5653
outputs:
5754
version: ${{ steps.properties.outputs.version }}
@@ -70,14 +67,6 @@ jobs:
7067
- name: Setup Gradle
7168
uses: gradle/gradle-build-action@v2
7269

73-
- name: Cache XDG_CACHE_HOME
74-
uses: actions/cache@v3
75-
with:
76-
path: ${{ env.XDG_CACHE_HOME }}
77-
key: ${{ runner.os }}-XDG_CACHE_HOME-${{ hashFiles('**/*.gradle*') }}
78-
restore-keys: |
79-
${{ runner.os }}-XDG_CACHE_HOME-
80-
8170
# Set environment variables
8271
- name: Export Properties
8372
id: properties

‎.github/workflows/integration-tests.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ name: Integration Tests
22

33
on: [ workflow_dispatch ]
44

5-
env:
6-
XDG_CACHE_HOME: "~/.config/"
7-
85
jobs:
96

107
gradleValidation:

‎.github/workflows/project-verification.yml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,8 @@ on:
55
schedule:
66
- cron: "0 0 * * *"
77

8-
env:
9-
XDG_CACHE_HOME: "~/.config/"
10-
118
jobs:
129

1310
gradleValidation:
1411
name: Gradle Validation
1512
uses: ./.github/workflows/reusable-gradleValidation.yml
16-
17-
integrationTestsCheck:
18-
name: Integration Tests Check
19-
runs-on: ubuntu-latest
20-
steps:
21-
- name: Fetch Sources
22-
uses: actions/checkout@v3
23-
24-
- name: Setup Java
25-
uses: actions/setup-java@v3
26-
with:
27-
distribution: zulu
28-
java-version: 11

‎.github/workflows/release-nightly.yml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ on:
99
type: boolean
1010
workflow_call:
1111

12-
env:
13-
XDG_CACHE_HOME: "~/.config/"
14-
1512
jobs:
1613

1714
gradleValidation:
@@ -75,14 +72,6 @@ jobs:
7572
- name: Setup Gradle
7673
uses: gradle/gradle-build-action@v2
7774

78-
- name: Cache XDG_CACHE_HOME
79-
uses: actions/cache@v3
80-
with:
81-
path: ${{ env.XDG_CACHE_HOME }}
82-
key: ${{ runner.os }}-XDG_CACHE_HOME-${{ hashFiles('**/*.gradle*') }}
83-
restore-keys: |
84-
${{ runner.os }}-XDG_CACHE_HOME-
85-
8675
# Publish the plugin to the Gradle Plugins
8776
- name: Publish Plugin
8877
env:

‎.github/workflows/release.yml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ on:
44
release:
55
types: [prereleased, released]
66

7-
env:
8-
XDG_CACHE_HOME: "~/.config/"
9-
107
jobs:
118

129
# Prepare and publish the Gradle Plugins repository
@@ -30,14 +27,6 @@ jobs:
3027
- name: Setup Gradle
3128
uses: gradle/gradle-build-action@v2
3229

33-
- name: Cache XDG_CACHE_HOME
34-
uses: actions/cache@v3
35-
with:
36-
path: ${{ env.XDG_CACHE_HOME }}
37-
key: ${{ runner.os }}-XDG_CACHE_HOME-${{ hashFiles('**/*.gradle*') }}
38-
restore-keys: |
39-
${{ runner.os }}-XDG_CACHE_HOME-
40-
4130
# Set environment variables
4231
- name: Export Properties
4332
id: properties

‎.github/workflows/reusable-codeInspection.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ name: Reusable Code Inspection
22

33
on: [ workflow_call ]
44

5-
env:
6-
XDG_CACHE_HOME: "~/.config/"
7-
85
jobs:
96
codeInspection:
107
name: Code Inspection

‎.github/workflows/reusable-integrationTests.yml‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ on:
88
default: 2022.1.4
99
type: string
1010

11-
env:
12-
XDG_CACHE_HOME: "~/.config/"
13-
1411
jobs:
1512
integrationTests:
1613
name: Gradle ${{ matrix.gradleVersion }} @ ${{ matrix.os }}
@@ -35,21 +32,11 @@ jobs:
3532
uses: actions/setup-java@v3
3633
with:
3734
distribution: zulu
38-
java-version: |
39-
17
40-
11
35+
java-version: 11
4136

4237
- name: Setup Gradle
4338
uses: gradle/gradle-build-action@v2
4439

45-
- name: Cache XDG_CACHE_HOME
46-
uses: actions/cache@v3
47-
with:
48-
path: ${{ env.XDG_CACHE_HOME }}
49-
key: ${{ runner.os }}-XDG_CACHE_HOME-${{ hashFiles('**/*.gradle*') }}
50-
restore-keys: |
51-
${{ runner.os }}-XDG_CACHE_HOME-
52-
5340
- name: Run Tests
5441
env:
5542
TEST_NAME: ${{ inputs.testName }}

‎.github/workflows/reusable-single-unitTest.yml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,10 @@ on:
2020
required: false
2121
description: 'Optional test name to run'
2222

23-
env:
24-
XDG_CACHE_HOME: "~/.config/"
25-
2623
jobs:
2724
unitTests:
2825
name: Gradle ${{ inputs.gradleVersion }} @ ${{ inputs.os }}
2926
runs-on: ${{ inputs.os }}
30-
strategy:
31-
fail-fast: false
3227
permissions:
3328
checks: write
3429
steps:
@@ -49,14 +44,6 @@ jobs:
4944
- name: Setup Gradle
5045
uses: gradle/gradle-build-action@v2
5146

52-
- name: Cache XDG_CACHE_HOME
53-
uses: actions/cache@v3
54-
with:
55-
path: ${{ env.XDG_CACHE_HOME }}
56-
key: ${{ runner.os }}-XDG_CACHE_HOME-${{ hashFiles('**/*.gradle*') }}
57-
restore-keys: |
58-
${{ runner.os }}-XDG_CACHE_HOME-
59-
6047
- name: Run Tests
6148
env:
6249
TEST_NAME: ${{ inputs.testName }}

‎.github/workflows/reusable-unitTests.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ name: Reusable Unit Tests
22

33
on: [ workflow_call ]
44

5-
env:
6-
XDG_CACHE_HOME: "~/.config/"
7-
85
jobs:
96
baseUnitTest:
107
name: Gradle 8.1.1 @ ubuntu-latest

‎.github/workflows/single-unitTest.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ on:
2121
- macos-latest
2222
workflow_call:
2323

24-
env:
25-
XDG_CACHE_HOME: "~/.config/"
26-
2724
jobs:
2825
unitTest:
2926
name: Gradle ${{ inputs.gradleVersion }} @ ${{ inputs.os }}

0 commit comments

Comments
 (0)