Skip to content

Commit 6bea841

Browse files
committed
Switch to shell script for updating
1 parent d6e86c8 commit 6bea841

File tree

1 file changed

+4
-51
lines changed

1 file changed

+4
-51
lines changed

.ci/updatecli.d/bump-upstream-agent-version.yml

Lines changed: 4 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,6 @@ sources:
3535
file: gradle/libs.versions.toml
3636
key: versions.opentelemetryJavaagentAlpha
3737

38-
semconv-version:
39-
dependson: [upstream-agent-version]
40-
kind: file
41-
spec:
42-
file: https://raw.githubusercontent.com/open-telemetry/opentelemetry-java-instrumentation/v{{ source "upstream-agent-version" }}/dependencyManagement/build.gradle.kts
43-
transformers:
44-
- findsubmatch:
45-
pattern: val\s+semConvVersion\s*=\s*"([^"]*)
46-
captureindex: 1
47-
48-
contrib-version:
49-
dependson: [upstream-agent-version]
50-
kind: file
51-
spec:
52-
file: https://raw.githubusercontent.com/open-telemetry/opentelemetry-java-instrumentation/v{{ source "upstream-agent-version" }}/dependencyManagement/build.gradle.kts
53-
transformers:
54-
- findsubmatch:
55-
pattern: val\s+otelContribVersion\s*=\s*"([^"]*)
56-
captureindex: 1
57-
5838
conditions:
5939
update-required:
6040
disablesourceinput: true
@@ -65,40 +45,13 @@ conditions:
6545
targets:
6646

6747
update-agent-version:
68-
name: "Update upstream OpenTelemetry agent version"
48+
name: "Update upstream OpenTelemetry agent version and related dependencies"
6949
conditionids: [update-required]
70-
sourceid: upstream-agent-version
71-
kind: file # toml action currently erases comments, so we fallback to regex-replace
72-
scmid: githubConfig
73-
spec:
74-
file: gradle/libs.versions.toml
75-
matchpattern: (opentelemetryJavaagentAlpha\s*=\s*)"(.*)"
76-
replacepattern: $1"{{ source "upstream-agent-version" }}-alpha"
77-
78-
update-contrib-version:
79-
dependson: [update-agent-version]
80-
name: "Update OpenTelemetry Contrib version"
81-
conditionids: [update-required]
82-
sourceid: contrib-version
83-
kind: file # toml action currently erases comments, so we fallback to regex-replace
84-
scmid: githubConfig
85-
spec:
86-
file: gradle/libs.versions.toml
87-
matchpattern: (opentelemetryContribAlpha\s*=\s*)"(.*)"
88-
replacepattern: $1"{{ source "contrib-version" }}"
89-
90-
update-semconv-version:
91-
dependson: [update-contrib-version]
92-
name: "Update OpenTelemetry SemConv version"
93-
conditionids: [update-required]
94-
sourceid: semconv-version
95-
kind: file # toml action currently erases comments, so we fallback to regex-replace
50+
disablesourceinput: true
51+
kind: shell # toml action currently erases comments, so we fallback to regex-replace
9652
scmid: githubConfig
9753
spec:
98-
file: gradle/libs.versions.toml
99-
matchpattern: (opentelemetrySemconvAlpha\s*=\s*)"(.*)"
100-
replacepattern: $1"{{ source "semconv-version" }}"
101-
54+
command: gradle/update-upstream.sh v"{{ source "upstream-agent-version" }}
10255

10356
actions:
10457
open-pr:

0 commit comments

Comments
 (0)