Skip to content
Open
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
38 changes: 27 additions & 11 deletions .github/workflows/pull-request-helper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,33 @@ jobs:
# fi
# git commit -a -m "./gradlew spotlessApply"

- name: Update lock files
id: update-lock-files
env:
NUMBER: ${{ github.event.issue.number }}
run: |
set +e
./gradlew resolveAndLockAll --write-locks 2>&1 | tee /tmp/resolve-and-lock-all.log
status=${PIPESTATUS[0]}
set -e
if [[ $status -ne 0 ]]
then
if grep -Fq "Could not find " /tmp/resolve-and-lock-all.log
then
echo "Updated dependency is not yet available in Maven repositories, skipping helper workflow."
echo "skip_follow_up=true" >> "$GITHUB_OUTPUT"
exit 0 # success
fi
exit $status
fi
git add "*.lockfile"
if git diff --cached --quiet; then
exit 0 # success
fi
git commit -m "./gradlew resolveAndLockAll --write-locks"

- name: Update license report
if: steps.update-lock-files.outputs.skip_follow_up != 'true'
env:
NUMBER: ${{ github.event.issue.number }}
run: |
Expand All @@ -53,18 +79,8 @@ jobs:
fi
git commit -m "./gradlew generateLicenseReport"

- name: Update lock files
env:
NUMBER: ${{ github.event.issue.number }}
run: |
./gradlew resolveAndLockAll --write-locks
git add "*.lockfile"
if git diff --cached --quiet; then
exit 0 # success
fi
git commit -m "./gradlew resolveAndLockAll --write-locks"

- name: Push
if: steps.update-lock-files.outputs.skip_follow_up != 'true'
env:
GH_TOKEN: ${{ github.token }}
run: |
Expand Down
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ rootProject.extra["otelInstrumentationVersion"] = otelInstrumentationVersion
rootProject.extra["otelInstrumentationAlphaVersion"] = otelInstrumentationAlphaVersion

val DEPENDENCY_BOMS = listOf(
"com.fasterxml.jackson:jackson-bom:2.21.3",
"com.fasterxml.jackson:jackson-bom:2.22.0",
"io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",
"io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}",
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${otelInstrumentationVersion}",
Expand Down
164 changes: 82 additions & 82 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

164 changes: 82 additions & 82 deletions perf-tests/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.