Skip to content

Commit 1e5250c

Browse files
authored
Fix release workflow (#17)
* Fix release workflow * Remove --exit-code flag
1 parent d81241f commit 1e5250c

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

.github/workflows/prepare-release-branch.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ jobs:
3030
- name: Create release branch
3131
run: |
3232
version=$(.github/scripts/get-version.sh)
33-
if [[ $version =~ ^([0-9]+)\.([0-9]+)\.0$ ]]; then
33+
if [[ $version =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then
3434
release_branch_name="release/v${version}"
35-
git ls-remote --exit-code --heads origin refs/heads/$release_branch_name
36-
if [ "$?" == "0" ] ; then
35+
release_branch_exists=$(git ls-remote --heads origin refs/heads/$release_branch_name)
36+
if [[ $release_branch_exists != "" ]] ; then
3737
echo "release branch $release_branch_name already exists"
38-
exit 1
38+
exit 1
3939
fi
4040
else
4141
echo "unexpected version: $version"

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
# Changelog
22

33
## Unreleased
4+
5+
* Move to `io.opentelemetry.semnconv.*` package
6+
([#14](https://github.com/open-telemetry/semantic-conventions-java/pull/14))
7+
* Update to semantic conventions v1.21.0
8+
([#9](https://github.com/open-telemetry/semantic-conventions-java/pull/9))

0 commit comments

Comments
 (0)