Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: MetaInf Wrong in Release Artifacts #363

Merged
merged 3 commits into from
Oct 11, 2024
Merged

fix: MetaInf Wrong in Release Artifacts #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8f2232
Replace the snapshot name with the release before building
stanbrub Oct 11, 2024
39e464a
Removed -i from sed
stanbrub Oct 11, 2024
dc599dd
Fixed some path and version issues
stanbrub Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions .github/scripts/make-release-distro.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,34 @@ 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"
exit 1
fi

RELEASE_VERSION=$1
DISTRO_SOURCE=$2
DISTRO_SOURCE=$(echo $(cd $(dirname "$2"); pwd)/$(basename "$2"))
ARTIFACT=deephaven-benchmark-${RELEASE_VERSION}
DISTRO_DEST=target/distro
WORKING_DIR=$(pwd)
DISTRO_DEST=${WORKING_DIR}/target/distro

# Generate dependencies directory
mkdir -p ${DISTRO_DEST}/libs/
cd ${DISTRO_DEST}
cp ${DISTRO_SOURCE}/dependency-pom.xml .
cat ${DISTRO_SOURCE}/dependency-pom.xml | sed "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
View file
Open in desktop
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