Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

making Renovate recognize GitHub Actions dependencies #1171

Merged
merged 3 commits into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,8 @@ ij_html_uniform_ident = false
[{*.yaml,*.yml}]
ij_yaml_keep_indents_on_empty_lines = false
ij_yaml_keep_line_breaks = true
ij_yaml_space_before_colon = true
# spaces before colons break Renovate's parsing of GitHub workflow files
# https://github.com/renovatebot/renovate/discussions/27088
ij_yaml_space_before_colon = false
ij_yaml_spaces_within_braces = true
ij_yaml_spaces_within_brackets = true
30 changes: 15 additions & 15 deletions .github/actions/gradle-args/action.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
name : Set Gradle Args for runner OS
description : Sets gradle property and jvm arguments based on runner OS
name: Set Gradle Args for runner OS
description: Sets gradle property and jvm arguments based on runner OS

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

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

runs :
using : composite
steps :
- id : set-args
shell : bash
run : |
runs:
using: composite
steps:
- id: set-args
shell: bash
run: |
runnerOS=$RUNNER_OS

# Set common JVM arguments
Expand Down
20 changes: 10 additions & 10 deletions .github/actions/gradle-task-with-commit/action.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name : Set Up Gradle and Run Task
description : This action performs a "fix"-type Gradle task and commits/pushes changes if possible.
name: Set Up Gradle and Run Task
description: This action performs a "fix"-type Gradle task and commits/pushes changes if possible.

inputs :
java-version :
description : 'The Java version to set up'
default : '17'
distribution :
description : 'The JDK distribution to use'
default : 'zulu'
fix-task :
inputs:
java-version:
description: 'The Java version to set up'
default: '17'
distribution:
description: 'The JDK distribution to use'
default: 'zulu'
fix-task:
description: 'The task to be executed if the user has a PAT and the branch is not a fork'
required: true
check-task:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/kotlin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ jobs :
api-level :
- 31
### <start-connected-check-shards>
shardNum : [ 1, 2, 3 ]
shardNum: [ 1, 2, 3 ]
### <end-connected-check-shards>
steps :
- uses : actions/checkout@v3
Expand All @@ -329,7 +329,7 @@ jobs :
api-level :
- 31
### <start-connected-check-shards>
shardNum : [ 1, 2, 3 ]
shardNum: [ 1, 2, 3 ]
### <end-connected-check-shards>
runtime : [ conflate, baseline-stateChange, conflate-stateChange ]
steps :
Expand Down
58 changes: 29 additions & 29 deletions .github/workflows/publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,35 +10,35 @@ env:
GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx12g -Dorg.gradle.daemon=false -Dorg.gradle.logging.stacktrace=all"

jobs:
publish-snapshot :
runs-on : workflow-kotlin-test-runner-ubuntu-4core
if : github.repository == 'square/workflow-kotlin'
timeout-minutes : 35
publish-snapshot:
runs-on: workflow-kotlin-test-runner-ubuntu-4core
if: github.repository == 'square/workflow-kotlin'
timeout-minutes: 35

steps :
steps:
- uses: actions/checkout@v3

- name : Check for -SNAPSHOT version
uses : ./.github/actions/gradle-task
with :
task : checkVersionIsSnapshot
write-cache-key : build-logic

- name : Assemble
uses : ./.github/actions/gradle-task
with :
task : assemble
write-cache-key : main-build-artifacts

- name : Check
uses : ./.github/actions/gradle-task
with :
task : check -x artifactsCheck

- name : Publish Snapshots
uses : ./.github/actions/gradle-task
with :
task : publish
env :
ORG_GRADLE_PROJECT_mavenCentralUsername : ${{ secrets.SONATYPE_NEXUS_USERNAME }}
ORG_GRADLE_PROJECT_mavenCentralPassword : ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
- name: Check for -SNAPSHOT version
uses: ./.github/actions/gradle-task
with:
task: checkVersionIsSnapshot
write-cache-key: build-logic

- name: Assemble
uses: ./.github/actions/gradle-task
with:
task: assemble
write-cache-key: main-build-artifacts

- name: Check
uses: ./.github/actions/gradle-task
with:
task: check -x artifactsCheck

- name: Publish Snapshots
uses: ./.github/actions/gradle-task
with:
task: publish
env:
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
Loading
Loading