diff --git a/.github/distro/dependency-pom.xml b/.github/distro/dependency-pom.xml new file mode 100644 index 0000000..1bd0523 --- /dev/null +++ b/.github/distro/dependency-pom.xml @@ -0,0 +1,40 @@ + + 4.0.0 + io.deephaven + deephaven-benchmark-distro + 1.0-SNAPSHOT + deephaven-benchmark-distro + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.8.0 + + + copy-dependencies + package + + copy-dependencies + + + ${project.build.directory}/dependencies + false + false + true + + + + + + + + + io.deephaven + deephaven-benchmark + 1.0-SNAPSHOT + + + diff --git a/.github/scripts/make-release-distro.sh b/.github/scripts/make-release-distro.sh index 9891802..4217a7d 100755 --- a/.github/scripts/make-release-distro.sh +++ b/.github/scripts/make-release-distro.sh @@ -36,10 +36,17 @@ echo "**What's Changed**" > ${RELEASE_NOTES} git log --oneline ${PREVIOUS_REF}...${RELEASE_COMMIT} | sed -e 's/^/- /' >> ${RELEASE_NOTES} echo "**Full Changelog**: https://github.com/deephaven/benchmark/compare/${PREVIOUS_TAG}...${RELEASE_TAG}" >> ${RELEASE_NOTES} -# Build the Distro for running standard benchmarks +# Generate dependencies directory mkdir -p ${DISTRO_DEST}/libs/ +cp ${DISTRO_SOURCE}/dependency-pom.xml ${DISTRO_DEST} +(cd ${DISTRO_DEST}; mvn -B install --file dependency-pom.xml) +mv ${DISTRO_DEST}/target/dependencies/* ${DISTRO_DEST}/libs/ +rm -rf ${DISTRO_DEST}/target +rm ${DISTRO_DEST}/libs/deephaven-benchmark-*SNAPSHOT*.jar + +# Build the Distro for running standard benchmarks cp ${DISTRO_SOURCE}/* ${DISTRO_DEST} -cp target/dependencies/* ${DISTRO_DEST}/libs +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 echo "VERSION=${RELEASE_VERSION}" > ${DISTRO_DEST}/.env diff --git a/.github/workflows/publish-benchmarks.yml b/.github/workflows/publish-benchmarks.yml index 402f733..176c616 100644 --- a/.github/workflows/publish-benchmarks.yml +++ b/.github/workflows/publish-benchmarks.yml @@ -67,16 +67,16 @@ jobs: working-directory: ${{env.RELEASE_DIR}} run: git checkout ${COMMIT} - - name: Build Release Artifacts + - name: Pull and Start Docker Image working-directory: ${{env.RELEASE_DIR}} run: | cp ${LATEST_DIR}/.github/resources/integration-docker-compose.yml docker-compose.yml docker compose up -d - - name: Build Release Artifacts + - name: Build and Install Release Artifacts Locally working-directory: ${{env.RELEASE_DIR}} run: | - mvn -B verify --file pom.xml + mvn -B install --file pom.xml docker compose down - name: Build Release Distro and Notes diff --git a/pom.xml b/pom.xml index 1cee6ef..ff24e38 100644 --- a/pom.xml +++ b/pom.xml @@ -57,26 +57,6 @@ 21 - - org.apache.maven.plugins - maven-dependency-plugin - 3.8.0 - - - copy-dependencies - package - - copy-dependencies - - - ${project.build.directory}/dependencies - false - false - true - - - - org.apache.maven.plugins maven-jar-plugin