From 4b58b1f260b717a4c73efbd16a93e9dc04cd87ab Mon Sep 17 00:00:00 2001 From: Samuel McCann Date: Wed, 11 Oct 2023 14:31:43 +0100 Subject: [PATCH 1/2] Update .blazar.yaml --- .blazar.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.blazar.yaml b/.blazar.yaml index a83edf3..53e592c 100644 --- a/.blazar.yaml +++ b/.blazar.yaml @@ -40,14 +40,15 @@ before: - description: "Move artifacts to upload directory" commands: - - echo export PROJECT_VERSION=$($SBT_BIN/sbt -warn 'print version') >> $BUILD_COMMAND_RC_FILE - - echo export PUBLISH_DIR=$PUBLISH_DIR_WITHOUT_VERSION-$(echo $PROJECT_VERSION | sed -n 's/^\([[:digit:]]*\.[[:digit:]]*\)-.*$/\1/p') >> $BUILD_COMMAND_RC_FILE - - mkdir $PUBLISH_DIR - - find target/scala-2.12 -maxdepth 1 -type f | xargs -I {} cp {} $PUBLISH_DIR - - mv $PUBLISH_DIR/"$PROJECT_NAME"_2.12-"$PROJECT_VERSION".pom $PUBLISH_DIR/pom.xml - - mv $PUBLISH_DIR/"$PROJECT_NAME"_2.12-"$PROJECT_VERSION".jar $PUBLISH_DIR/main.jar - - mv $PUBLISH_DIR/"$PROJECT_NAME"_2.12-"$PROJECT_VERSION"-sources.jar $PUBLISH_DIR/sources.jar - - mv $PUBLISH_DIR/"$PROJECT_NAME"_2.12-"$PROJECT_VERSION"-javadoc.jar $PUBLISH_DIR/javadoc.jar + - | + echo export PROJECT_VERSION=$($SBT_BIN/sbt -warn 'print version') >> $BUILD_COMMAND_RC_FILE + echo export PUBLISH_DIR=$PUBLISH_DIR_WITHOUT_VERSION-$(echo $PROJECT_VERSION | sed -n 's/^\([[:digit:]]*\.[[:digit:]]*\)-.*$/\1/p') >> $BUILD_COMMAND_RC_FILE + mkdir $PUBLISH_DIR + find target/scala-2.12 -maxdepth 1 -type f | xargs -I {} cp {} $PUBLISH_DIR + mv $PUBLISH_DIR/"$PROJECT_NAME"_2.12-"$PROJECT_VERSION".pom $PUBLISH_DIR/pom.xml + mv $PUBLISH_DIR/"$PROJECT_NAME"_2.12-"$PROJECT_VERSION".jar $PUBLISH_DIR/main.jar + mv $PUBLISH_DIR/"$PROJECT_NAME"_2.12-"$PROJECT_VERSION"-sources.jar $PUBLISH_DIR/sources.jar + mv $PUBLISH_DIR/"$PROJECT_NAME"_2.12-"$PROJECT_VERSION"-javadoc.jar $PUBLISH_DIR/javadoc.jar - name: uploadAndNotify description: "Notifying deploy service" From 0adc84e554888c98e54915c602856d4604656d1a Mon Sep 17 00:00:00 2001 From: Samuel McCann Date: Wed, 11 Oct 2023 14:35:15 +0100 Subject: [PATCH 2/2] Update .blazar.yaml --- .blazar.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.blazar.yaml b/.blazar.yaml index 53e592c..176c2f4 100644 --- a/.blazar.yaml +++ b/.blazar.yaml @@ -41,8 +41,8 @@ before: - description: "Move artifacts to upload directory" commands: - | - echo export PROJECT_VERSION=$($SBT_BIN/sbt -warn 'print version') >> $BUILD_COMMAND_RC_FILE - echo export PUBLISH_DIR=$PUBLISH_DIR_WITHOUT_VERSION-$(echo $PROJECT_VERSION | sed -n 's/^\([[:digit:]]*\.[[:digit:]]*\)-.*$/\1/p') >> $BUILD_COMMAND_RC_FILE + PROJECT_VERSION=$($SBT_BIN/sbt -warn 'print version') + PUBLISH_DIR=$PUBLISH_DIR_WITHOUT_VERSION-$(echo $PROJECT_VERSION | sed -n 's/^\([[:digit:]]*\.[[:digit:]]*\)-.*$/\1/p') mkdir $PUBLISH_DIR find target/scala-2.12 -maxdepth 1 -type f | xargs -I {} cp {} $PUBLISH_DIR mv $PUBLISH_DIR/"$PROJECT_NAME"_2.12-"$PROJECT_VERSION".pom $PUBLISH_DIR/pom.xml