You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2022/03/14 19:44:06 UTC
[isis] branch ISIS-2975 updated: ISIS-2975: experiments (26)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2975
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-2975 by this push:
new 509a0ef ISIS-2975: experiments (26)
509a0ef is described below
commit 509a0ef3052e7904ca4f78358d729ba864ebed58
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Mar 14 19:40:25 2022 +0000
ISIS-2975: experiments (26)
---
.github/workflows/ci-build-artifacts-push-maven.yml | 1 +
scripts/ci/build-artifacts.sh | 11 +++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci-build-artifacts-push-maven.yml b/.github/workflows/ci-build-artifacts-push-maven.yml
index 3ef32d8..9f8096d 100644
--- a/.github/workflows/ci-build-artifacts-push-maven.yml
+++ b/.github/workflows/ci-build-artifacts-push-maven.yml
@@ -89,6 +89,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MVN_STAGES: deploy
SOURCE_MODE: attach
+ SETTINGS_FLAG: no-override
# FOR DEBUG USE
diff --git a/scripts/ci/build-artifacts.sh b/scripts/ci/build-artifacts.sh
index 4f425da..0077576 100644
--- a/scripts/ci/build-artifacts.sh
+++ b/scripts/ci/build-artifacts.sh
@@ -147,13 +147,20 @@ if [ ! -z "$REVISION" ]; then
fi
+if [ "SETTINGS_FLAG" = "no-override" ]
+then
+ SETTINGS_CLAUSE=""
+else
+ SETTINGS_CLAUSE="-s $SETTINGS_XML "
+fi
+
cd $PROJECT_ROOT_PATH
echo ""
echo ""
-echo ">>> ${PROJECT_ROOT_PATH}: mvn -s $SETTINGS_XML $BATCH_MODE $SOURCE_MODE_OPTS -T1C $MVN_STAGES $MVN_ADDITIONAL_OPTS $*"
+echo ">>> ${PROJECT_ROOT_PATH}: mvn $SETTINGS_CLAUSE $BATCH_MODE $SOURCE_MODE_OPTS -T1C $MVN_STAGES $MVN_ADDITIONAL_OPTS $*"
echo ""
echo ""
-mvn -s $SETTINGS_XML \
+mvn $SETTINGS_CLAUSE \
$BATCH_MODE \
$SOURCE_MODE_OPTS \
-T1C \