diff --git a/.github/scripts/extract-version.sh b/.github/scripts/extract-version.sh index 5f6507bd..39cbeceb 100755 --- a/.github/scripts/extract-version.sh +++ b/.github/scripts/extract-version.sh @@ -34,13 +34,13 @@ if [ -z "$VERSION_LINE" ]; then exit 1 fi -# Extract just the semantic version (before the + or -) -VERSION=$(echo "$VERSION_LINE" | sed 's/version: *//' | sed 's/[+\-].*//' | tr -d ' ') +# Extract full version including suffix/build number +VERSION=$(echo "$VERSION_LINE" | sed 's/version: *//' | tr -d ' ') -# Validate version format -if ! [[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then +# Validate version format (X.Y.Z with optional +build or -suffix) +if ! [[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+([-+][a-zA-Z0-9]+)?$ ]]; then echo "❌ Error: Invalid version format in pubspec.yaml: $VERSION" >&2 - echo "Expected format: X.Y.Z (e.g., 0.1.0)" >&2 + echo "Expected format: X.Y.Z, X.Y.Z+build, or X.Y.Z-suffix (e.g., 0.1.0, 0.1.0+12, 0.1.0-m3)" >&2 exit 1 fi diff --git a/.github/workflows/product-release.yml b/.github/workflows/product-release.yml index f3f3930c..a437cf28 100644 --- a/.github/workflows/product-release.yml +++ b/.github/workflows/product-release.yml @@ -45,7 +45,7 @@ jobs: with: fetch-depth: 0 - - name: � Make scripts executable + - name: 🏃🏾‍♂️ Make scripts executable run: | chmod +x .github/scripts/*.sh echo "✅ Scripts are now executable" @@ -165,8 +165,6 @@ jobs: uses: actions/setup-node@v4 with: node-version: '20' - cache: 'npm' - cache-dependency-path: 'backend/*/package-lock.json' - name: 🔥 Install Firebase CLI run: |