Skip to content

Commit bd5daf5

Browse files
committed
grep fixes
1 parent 3c2e3fe commit bd5daf5

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
141141
CURRENT_BUILD=$(grep '^version:' pubspec.yaml | sed -E 's/^version: [0-9]+\.[0-9]+\.[0-9]+\+([0-9]+).*/\1/')
142142
BUILD_NUMBER=$((CURRENT_BUILD + 1))
143-
FULL_VERSION="${NEW_VERSION}+${NEW_BUILD}"
143+
FULL_VERSION="${BASE_VERSION}+${BUILD_NUMBER}"
144144
145145
echo "Setting pubspec version: $FULL_VERSION"
146146
echo " Base version: $BASE_VERSION"

scripts/ci/version.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ get_latest_version() {
4343
production)
4444
pattern='v[0-9]*\.[0-9]*\.[0-9]*'
4545
# Exclude prerelease tags (beta/internal/nightly with timestamps)
46-
local tag=$(git tag -l "$pattern" | grep -v -E '-(beta|internal)|T.*Z' | sort -V | tail -1)
46+
local tag=$(git tag -l "$pattern" | grep -v -E -- '-(beta|internal)|T.*Z' | sort -V | tail -1)
4747
;;
4848
internal)
4949
pattern='v[0-9]*\.[0-9]*\.[0-9]*-internal'
5050
# Exclude nightly tags with timestamps
51-
local tag=$(git tag -l "$pattern" | grep -v 'T.*Z' | sort -V | tail -1)
51+
local tag=$(git tag -l "$pattern" | grep -v -E -- 'T.*Z' | sort -V | tail -1)
5252
;;
5353
beta)
5454
pattern='v[0-9]*\.[0-9]*\.[0-9]*-beta'
5555
# Exclude nightly tags with timestamps
56-
local tag=$(git tag -l "$pattern" | grep -v 'T.*Z' | sort -V | tail -1)
56+
local tag=$(git tag -l "$pattern" | grep -v -E -- 'T.*Z' | sort -V | tail -1)
5757
;;
5858
*)
5959
echo "Error: Unknown type '$type'" >&2

0 commit comments

Comments
 (0)