diff --git a/.github/scripts/make-release-distro.sh b/.github/scripts/make-release-distro.sh index c7188aa9..fc309b61 100755 --- a/.github/scripts/make-release-distro.sh +++ b/.github/scripts/make-release-distro.sh @@ -7,8 +7,7 @@ set -o nounset # Copyright (c) 2024-2024 Deephaven Data Labs and Patent Pending # Create a tar file with the given version using the git project located in the -# working directory. Also, make a release-notes.md files compared between the given -# release commit and previous version +# working directory. if [[ $# != 2 ]]; then echo "$0: Missing release version or distro source argument" @@ -24,18 +23,18 @@ WORKING_DIR=$(pwd) # Generate dependencies directory mkdir -p ${DISTRO_DEST}/libs/ cd ${DISTRO_DEST} -cp ${DISTRO_SOURCE}/dependency-pom.xml . +cat ${DISTRO_SOURCE}/dependency-pom.xml | sed -i "s!1.0-SNAPSHOT!${RELEASE_VERSION}!g" > dependency-pom.xml mvn -B install --file dependency-pom.xml mv target/dependencies/* libs/ rm -rf target -rm libs/deephaven-benchmark-*SNAPSHOT*.jar +rm libs/${ARTIFACT}*.jar cd ${WORKING_DIR} # Build the Distro for running standard benchmarks cp ${DISTRO_SOURCE}/* ${DISTRO_DEST} rm ${DISTRO_DEST}/dependency-pom.xml -cp target/deephaven-benchmark-1.0-SNAPSHOT.jar ${DISTRO_DEST}/libs/${ARTIFACT}.jar -cp target/deephaven-benchmark-1.0-SNAPSHOT-tests.jar ${DISTRO_DEST}/libs/${ARTIFACT}-tests.jar +cp target/${ARTIFACT}.jar ${DISTRO_DEST}/libs/ +cp target/${ARTIFACT}-tests.jar ${DISTRO_DEST}/libs/ echo "VERSION=${RELEASE_VERSION}" > ${DISTRO_DEST}/.env cd ${DISTRO_DEST} diff --git a/.github/workflows/publish-benchmarks.yml b/.github/workflows/publish-benchmarks.yml index 9a360c6b..4a6b3ba9 100644 --- a/.github/workflows/publish-benchmarks.yml +++ b/.github/workflows/publish-benchmarks.yml @@ -77,8 +77,9 @@ jobs: - name: Build and Install Release Artifacts Locally working-directory: ${{env.RELEASE_DIR}} run: | + sed -i "s!1.0-SNAPSHOT!${VERSION}!" pom.xml mvn -B install --file pom.xml - docker compose down + docker compose down - name: Build Release Distribution working-directory: ${{env.RELEASE_DIR}}