Skip to content

Commit

Permalink
Replace the snapshot name with the release before building
Browse files Browse the repository at this point in the history
  • Loading branch information
stanbrub committed Oct 11, 2024
1 parent 137013d commit c8f2232
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
11 changes: 5 additions & 6 deletions .github/scripts/make-release-distro.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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!<version>1.0-SNAPSHOT</version>!<version>${RELEASE_VERSION}</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}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/publish-benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,9 @@ jobs:
- name: Build and Install Release Artifacts Locally
working-directory: ${{env.RELEASE_DIR}}
run: |
sed -i "s!<version>1.0-SNAPSHOT</version>!<version>${VERSION}</version>!" pom.xml
mvn -B install --file pom.xml
docker compose down
docker compose down
- name: Build Release Distribution
working-directory: ${{env.RELEASE_DIR}}
Expand Down

0 comments on commit c8f2232

Please sign in to comment.