Skip to content

Commit 4888ae9

Browse files
committed
ci: fixed CI grep usage
1 parent 1333022 commit 4888ae9

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

.gitlab-ci.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ conventional-commits-next-version-checking:
6060
- LATEST_TAG=`git describe --tags | cut -d '-' -f 1`
6161
- LATEST_TAG_HASH=`git rev-parse $LATEST_TAG`
6262
# Check latest tag is in semantic versioning.
63-
- LATEST_TAG_SEMANTIC_VERSIONING=`echo $LATEST_TAG | grep "^[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*$" | wc -l`
64-
- test $LATEST_TAG_SEMANTIC_VERSIONING -eq 1 || exit 1
63+
- echo $LATEST_TAG | grep "^[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*$"
6564
# Check current vs expected.
6665
- /usr/local/cargo/bin/conventional_commits_next_version --batch-commits --from-commit-hash $LATEST_TAG_HASH --from-version $LATEST_TAG --current-version $CURRENT_VERSION
6766
rules:
@@ -73,8 +72,7 @@ version-badge-checking:
7372
image: alpine
7473
script:
7574
- CURRENT_VERSION=`grep '^version = "[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*"$' Cargo.toml | cut -d '"' -f 2`
76-
- BADGE_COUNT=`grep "(https://img.shields.io/badge/Version-$CURRENT_VERSION-blue)]" README.md | wc -l`
77-
- test $BADGE_COUNT -eq 1
75+
- grep "(https://img.shields.io/badge/Version-$CURRENT_VERSION-blue)]" README.md
7876
rules:
7977
- if: $CI_MERGE_REQUEST_ID
8078

@@ -106,15 +104,13 @@ releasing:
106104
- apk add git
107105
script:
108106
- CURRENT_VERSION=`grep '^version = "[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*"$' Cargo.toml | cut -d '"' -f 2`
109-
- TAG_EXISTS=`git tag -l | grep "^$CURRENT_VERSION$" | wc -l`
110107
# If the tag already exist then exit.
111-
- test $TAG_EXISTS -eq 1 && exit 0
108+
- git tag -l | grep "^${CURRENT_VERSION}$" && exit 0
112109
# Get latest tag.
113110
- LATEST_TAG=`git describe --tags | cut -d '-' -f 1`
114111
- LATEST_TAG_HASH=`git rev-parse $LATEST_TAG`
115112
# Check latest tag is in semantic versioning.
116-
- LATEST_TAG_SEMANTIC_VERSIONING=`echo $LATEST_TAG | grep "^[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*$" | wc -l`
117-
- test $LATEST_TAG_SEMANTIC_VERSIONING -eq 1 || exit 1
113+
- echo $LATEST_TAG | grep "^[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*$"
118114
# Download clog.
119115
- wget https://github.com/clog-tool/clog-cli/releases/download/v0.9.3/clog-v0.9.3-x86_64-unknown-linux-musl.tar.gz
120116
- tar xvf clog-v0.9.3-x86_64-unknown-linux-musl.tar.gz

0 commit comments

Comments
 (0)