Skip to content

Commit f5e970c

Browse files
authored
Fix registry version updater (#5685)
Signed-off-by: svrnm <[email protected]>
1 parent 4807346 commit f5e970c

6 files changed

+47
-12
lines changed

.github/workflows/scripts/update-registry-versions.sh

+20-10
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,11 @@ for yaml_file in ${FILES}; do
8282
echo "${yaml_file}: Package name and/or registry are missing in the YAML file."
8383
else
8484
# Get latest version
85-
latest_version=$(get_latest_version "$name" "$registry")
85+
latest_version=$(get_latest_version "$name" "$registry" || echo "Could not fetch version.")
8686

87-
if [ "$latest_version" == "Registry not supported." ]; then
87+
if [ "$latest_version" == "Could not fetch version." ]; then
88+
echo "${yaml_file} ($registry): Registry not supported.";
89+
elif [ "$latest_version" == "Registry not supported." ]; then
8890
echo "${yaml_file} ($registry): Registry not supported.";
8991
elif [ -z "$latest_version" ]; then
9092
echo "${yaml_file} ($registry): Could not get latest version from registry."
@@ -118,14 +120,22 @@ if [ "$existing_pr_count" -gt 0 ]; then
118120
exit 0
119121
fi
120122

121-
$NPM run fix:format
123+
if [[ -n $(git status --porcelain) ]]; then
124+
echo "Versions have been updated, formatting and pushing changes."
125+
126+
$NPM run fix:format
127+
128+
$GIT checkout -b "$branch"
129+
$GIT commit -a -m "$message"
130+
$GIT push --set-upstream origin "$branch"
122131

123-
$GIT checkout -b "$branch"
124-
$GIT commit -a -m "$message"
125-
$GIT push --set-upstream origin "$branch"
132+
body_file=$(mktemp)
133+
echo -en "${body}" >> "${body_file}"
126134

127-
body_file=$(mktemp)
128-
echo -en "${body}" >> "${body_file}"
135+
echo "Submitting auto-update PR '$message'."
136+
$GH pr create --title "$message" --body-file "${body_file}"
129137

130-
echo "Submitting auto-update PR '$message'."
131-
$GH pr create --title "$message" --body-file "${body_file}"
138+
else
139+
echo "No changes detected."
140+
exit 0
141+
fi

data/registry/instrumentation-php-cakephp.yml

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# cSpell:ignore cakephp
12
title: OpenTelemetry CakePHP instrumentation library
23
registryType: instrumentation
34
language: php
@@ -14,4 +15,8 @@ description:
1415
authors:
1516
- name: OpenTelemetry Authors
1617
createdAt: 2024-07-08
18+
package:
19+
registry: packagist
20+
name: open-telemetry/opentelemetry-auto-cakephp
21+
version: 0.0.3
1722
isFirstParty: false

data/registry/instrumentation-php-curl.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ authors:
1818
createdAt: 2024-11-18
1919
package:
2020
registry: packagist
21-
name: opentelemetry-auto-curl
21+
name: open-telemetry/opentelemetry-auto-curl
2222
version: 0.0.1
2323
isFirstParty: false

data/registry/instrumentation-php-extrdkafka.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ authors:
1919
createdAt: 2024-11-18
2020
package:
2121
registry: packagist
22-
name: opentelemetry-auto-ext-rdkafka
22+
name: open-telemetry/opentelemetry-auto-ext-rdkafka
2323
version: 0.0.1
2424
isFirstParty: false

data/registry/instrumentation-php-psr6.yml

+4
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,8 @@ description:
1414
authors:
1515
- name: OpenTelemetry Authors
1616
createdAt: 2024-07-08
17+
package:
18+
registry: packagist
19+
name: open-telemetry/opentelemetry-auto-psr6
20+
version: 0.0.3
1721
isFirstParty: false

static/refcache.json

+16
Original file line numberDiff line numberDiff line change
@@ -10563,14 +10563,26 @@
1056310563
"StatusCode": 200,
1056410564
"LastSeen": "2024-08-09T11:02:21.246316-04:00"
1056510565
},
10566+
"https://packagist.org/packages/open-telemetry/opentelemetry-auto-cakephp": {
10567+
"StatusCode": 200,
10568+
"LastSeen": "2024-12-03T11:06:06.86216+01:00"
10569+
},
1056610570
"https://packagist.org/packages/open-telemetry/opentelemetry-auto-codeigniter": {
1056710571
"StatusCode": 200,
1056810572
"LastSeen": "2024-01-19T13:15:35.481102+01:00"
1056910573
},
10574+
"https://packagist.org/packages/open-telemetry/opentelemetry-auto-curl": {
10575+
"StatusCode": 200,
10576+
"LastSeen": "2024-12-03T10:13:27.914323+01:00"
10577+
},
1057010578
"https://packagist.org/packages/open-telemetry/opentelemetry-auto-ext-amqp": {
1057110579
"StatusCode": 200,
1057210580
"LastSeen": "2024-01-19T13:15:35.677617+01:00"
1057310581
},
10582+
"https://packagist.org/packages/open-telemetry/opentelemetry-auto-ext-rdkafka": {
10583+
"StatusCode": 200,
10584+
"LastSeen": "2024-12-03T10:13:28.648777+01:00"
10585+
},
1057410586
"https://packagist.org/packages/open-telemetry/opentelemetry-auto-guzzle": {
1057510587
"StatusCode": 200,
1057610588
"LastSeen": "2024-01-19T13:15:35.857673+01:00"
@@ -10619,6 +10631,10 @@
1061910631
"StatusCode": 200,
1062010632
"LastSeen": "2024-01-19T13:15:37.331332+01:00"
1062110633
},
10634+
"https://packagist.org/packages/open-telemetry/opentelemetry-auto-psr6": {
10635+
"StatusCode": 200,
10636+
"LastSeen": "2024-12-03T10:13:31.800557+01:00"
10637+
},
1062210638
"https://packagist.org/packages/open-telemetry/opentelemetry-auto-slim": {
1062310639
"StatusCode": 200,
1062410640
"LastSeen": "2024-01-19T13:15:37.510707+01:00"

0 commit comments

Comments
 (0)