From 70e25642ff825c8dbb0294e18362e39814bb1031 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Sat, 30 Sep 2023 20:44:03 +0200
Subject: [PATCH] [ci] Fix build scripts

---
 .ci/build.sh  | 2 +-
 do-release.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/build.sh b/.ci/build.sh
index 481ec3d66b..9016954290 100755
--- a/.ci/build.sh
+++ b/.ci/build.sh
@@ -190,7 +190,7 @@ function pmd_ci_build_run() {
             ./mvnw clean deploy -P"${mvn_profiles}",'!cli-dist' --show-version --errors --batch-mode "${PMD_MAVEN_EXTRA_OPTS[@]}"
         else
             # b) pmd-cli and pmd-dist
-            ./mvnw clean deploy -pl pmd-cli,pmd-dist --show-version --errors --batch-mode "${PMD_MAVEN_EXTRA_OPTS[@]}"
+            ./mvnw clean deploy -P"${mvn_profiles},cli-dist" -pl pmd-cli,pmd-dist --show-version --errors --batch-mode "${PMD_MAVEN_EXTRA_OPTS[@]}"
         fi
     else
         pmd_ci_log_info "This is a snapshot build"
diff --git a/do-release.sh b/do-release.sh
index eb01716c74..d597384cdb 100755
--- a/do-release.sh
+++ b/do-release.sh
@@ -262,7 +262,7 @@ git checkout master
 # make sure parent reference is correct
 ./mvnw versions:update-parent -DparentVersion="${DEVELOPMENT_VERSION}" -DskipResolution=true -DgenerateBackupPoms=false -pl pmd-cli,pmd-dist
 git add pmd-cli/pom.xml pmd-dist/pom.xml
-changes=$(git status --porcelain 2>/dev/null| grep -c -E "^[AMDRC]")
+changes=$(git status --porcelain 2>/dev/null | grep -c -E "^[AMDRC]" || true)
 if [ "$changes" -gt 0 ]; then
     git commit -m "Prepare next development version [skip ci]"
     git push origin "${CURRENT_BRANCH}"