Skip to content

Commit

Permalink
Merge pull request #3023 from gchq/3022-skip-rust-in-build-scripts
Browse files Browse the repository at this point in the history
Issue 3022 - Append arguments to mvn command in build scripts
  • Loading branch information
patchwork01 authored Aug 7, 2024
2 parents ffbd0d4 + aad533d commit c2b19ea
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions scripts/build/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@ JARS_DIR="$SCRIPTS_DIR/jars"
DOCKER_DIR="$SCRIPTS_DIR/docker"
VERSION_FILE="$SCRIPTS_DIR/templates/version.txt"

if [ "$#" -lt 1 ]; then
MAVEN_PARAMS=(clean install -q -Pquick -T 1C)
else
MAVEN_PARAMS=("$@")
fi

source "$SCRIPTS_DIR/functions/timeUtils.sh"
START_BUILD_TIME=$(record_time)
pushd "$MAVEN_DIR"
Expand All @@ -40,7 +34,7 @@ echo "Started at $(recorded_time_str "$START_BUILD_TIME")"

VERSION=$(mvn -q -DforceStdout help:evaluate -Dexpression=project.version)
SCRIPTS_DISTRIBUTION_DIR="$MAVEN_DIR/distribution/target/distribution-$VERSION-bin/scripts"
mvn "${MAVEN_PARAMS[@]}"
mvn clean install -q -Pquick -T 1C "$@"

mkdir -p "$JARS_DIR"
mkdir -p "$DOCKER_DIR"
Expand Down

0 comments on commit c2b19ea

Please sign in to comment.