Skip to content

Commit f24d36f

Browse files
authored
Merge pull request #1171 from square/rick/renovate-config
making Renovate recognize GitHub Actions dependencies
2 parents 17d832a + 6ca73ff commit f24d36f

File tree

7 files changed

+240
-230
lines changed

7 files changed

+240
-230
lines changed

.editorconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,6 +635,8 @@ ij_html_uniform_ident = false
635635
[{*.yaml,*.yml}]
636636
ij_yaml_keep_indents_on_empty_lines = false
637637
ij_yaml_keep_line_breaks = true
638-
ij_yaml_space_before_colon = true
638+
# spaces before colons break Renovate's parsing of GitHub workflow files
639+
# https://github.com/renovatebot/renovate/discussions/27088
640+
ij_yaml_space_before_colon = false
639641
ij_yaml_spaces_within_braces = true
640642
ij_yaml_spaces_within_brackets = true

.github/actions/gradle-args/action.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
name : Set Gradle Args for runner OS
2-
description : Sets gradle property and jvm arguments based on runner OS
1+
name: Set Gradle Args for runner OS
2+
description: Sets gradle property and jvm arguments based on runner OS
33

44
# This action sets JVM arguments based upon the runner's operating system,
55
# since they all have different hardware and different memory footprints.
66
# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources
77

8-
outputs :
9-
gradle-property-args :
10-
description : "ex: -Dfile.encoding=UTF-8"
11-
value : ${{ steps.set-args.outputs.gradle-property-args }}
12-
gradle-jvm-args :
13-
description : "ex: -Xmx5g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
14-
value : ${{ steps.set-args.outputs.gradle-jvm-args }}
8+
outputs:
9+
gradle-property-args:
10+
description: "ex: -Dfile.encoding=UTF-8"
11+
value: ${{ steps.set-args.outputs.gradle-property-args }}
12+
gradle-jvm-args:
13+
description: "ex: -Xmx5g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
14+
value: ${{ steps.set-args.outputs.gradle-jvm-args }}
1515

16-
runs :
17-
using : composite
18-
steps :
19-
- id : set-args
20-
shell : bash
21-
run : |
16+
runs:
17+
using: composite
18+
steps:
19+
- id: set-args
20+
shell: bash
21+
run: |
2222
runnerOS=$RUNNER_OS
2323
2424
# Set common JVM arguments

.github/actions/gradle-task-with-commit/action.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
name : Set Up Gradle and Run Task
2-
description : This action performs a "fix"-type Gradle task and commits/pushes changes if possible.
1+
name: Set Up Gradle and Run Task
2+
description: This action performs a "fix"-type Gradle task and commits/pushes changes if possible.
33

4-
inputs :
5-
java-version :
6-
description : 'The Java version to set up'
7-
default : '17'
8-
distribution :
9-
description : 'The JDK distribution to use'
10-
default : 'zulu'
11-
fix-task :
4+
inputs:
5+
java-version:
6+
description: 'The Java version to set up'
7+
default: '17'
8+
distribution:
9+
description: 'The JDK distribution to use'
10+
default: 'zulu'
11+
fix-task:
1212
description: 'The task to be executed if the user has a PAT and the branch is not a fork'
1313
required: true
1414
check-task:

.github/workflows/kotlin.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ jobs :
304304
api-level :
305305
- 31
306306
### <start-connected-check-shards>
307-
shardNum : [ 1, 2, 3 ]
307+
shardNum: [ 1, 2, 3 ]
308308
### <end-connected-check-shards>
309309
steps :
310310
- uses : actions/checkout@v3
@@ -329,7 +329,7 @@ jobs :
329329
api-level :
330330
- 31
331331
### <start-connected-check-shards>
332-
shardNum : [ 1, 2, 3 ]
332+
shardNum: [ 1, 2, 3 ]
333333
### <end-connected-check-shards>
334334
runtime : [ conflate, baseline-stateChange, conflate-stateChange ]
335335
steps :

.github/workflows/publish-snapshot.yml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,35 @@ env:
1010
GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx12g -Dorg.gradle.daemon=false -Dorg.gradle.logging.stacktrace=all"
1111

1212
jobs:
13-
publish-snapshot :
14-
runs-on : workflow-kotlin-test-runner-ubuntu-4core
15-
if : github.repository == 'square/workflow-kotlin'
16-
timeout-minutes : 35
13+
publish-snapshot:
14+
runs-on: workflow-kotlin-test-runner-ubuntu-4core
15+
if: github.repository == 'square/workflow-kotlin'
16+
timeout-minutes: 35
1717

18-
steps :
18+
steps:
1919
- uses: actions/checkout@v3
2020

21-
- name : Check for -SNAPSHOT version
22-
uses : ./.github/actions/gradle-task
23-
with :
24-
task : checkVersionIsSnapshot
25-
write-cache-key : build-logic
26-
27-
- name : Assemble
28-
uses : ./.github/actions/gradle-task
29-
with :
30-
task : assemble
31-
write-cache-key : main-build-artifacts
32-
33-
- name : Check
34-
uses : ./.github/actions/gradle-task
35-
with :
36-
task : check -x artifactsCheck
37-
38-
- name : Publish Snapshots
39-
uses : ./.github/actions/gradle-task
40-
with :
41-
task : publish
42-
env :
43-
ORG_GRADLE_PROJECT_mavenCentralUsername : ${{ secrets.SONATYPE_NEXUS_USERNAME }}
44-
ORG_GRADLE_PROJECT_mavenCentralPassword : ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
21+
- name: Check for -SNAPSHOT version
22+
uses: ./.github/actions/gradle-task
23+
with:
24+
task: checkVersionIsSnapshot
25+
write-cache-key: build-logic
26+
27+
- name: Assemble
28+
uses: ./.github/actions/gradle-task
29+
with:
30+
task: assemble
31+
write-cache-key: main-build-artifacts
32+
33+
- name: Check
34+
uses: ./.github/actions/gradle-task
35+
with:
36+
task: check -x artifactsCheck
37+
38+
- name: Publish Snapshots
39+
uses: ./.github/actions/gradle-task
40+
with:
41+
task: publish
42+
env:
43+
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
44+
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}

0 commit comments

Comments
 (0)