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.

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

[AD-915] Auto Installer - JVM included #124

Merged
merged 41 commits into from
Oct 6, 2022

Conversation

birschick-bq
Copy link
Contributor

@birschick-bq birschick-bq commented Sep 29, 2022

Summary

[AD-915] Embed JRE into install. Simplify versioning of JDBC driver.

Description

  • Create a new installer for the JRE runtime
  • Simplify how to determine the version of the JDBC driver.
  • Combine the JRE runtime with C++ runtime and ODBC driver.

Related Issue

https://bitquill.atlassian.net/browse/AD-915

Additional Reviewers

@affonsoBQ
@alexey-temnikov
@alinaliBQ
@andiem-bq
@birschick-bq
@mitchell-elholm
@RoyZhang2022

@github-actions
Copy link

github-actions bot commented Sep 29, 2022

Ubuntu 20.04 Debug Build Unit Test Results

    1 files  ±0      1 suites  ±0   37s ⏱️ +8s
275 tests ±0  263 ✔️ ±0  12 💤 ±0  0 ±0 
263 runs  ±0  263 ✔️ ±0    0 💤 ±0  0 ±0 

Results for commit 829477e. ± Comparison against base commit 73fbf7a.

♻️ This comment has been updated with latest results.

@github-actions
Copy link

github-actions bot commented Sep 29, 2022

Windows 2022 (x64) Build Unit Test Results

    1 files  ±0      1 suites  ±0   1m 5s ⏱️ -3s
275 tests ±0  263 ✔️ ±0  12 💤 ±0  0 ±0 
263 runs  ±0  251 ✔️ ±0  12 💤 ±0  0 ±0 

Results for commit 829477e. ± Comparison against base commit 73fbf7a.

♻️ This comment has been updated with latest results.

@github-actions
Copy link

github-actions bot commented Sep 29, 2022

Windows 2022 (x32) Build Unit Test Results

    1 files  ±0      1 suites  ±0   1m 0s ⏱️ -12s
275 tests ±0  263 ✔️ ±0  12 💤 ±0  0 ±0 
263 runs  ±0  251 ✔️ ±0  12 💤 ±0  0 ±0 

Results for commit 829477e. ± Comparison against base commit 73fbf7a.

♻️ This comment has been updated with latest results.

@github-actions
Copy link

github-actions bot commented Sep 29, 2022

MacOS Big Sur 11 Debug Build Unit Test Results

    1 files  ±0      1 suites  ±0   1m 52s ⏱️ + 1m 10s
272 tests ±0  260 ✔️ ±0  12 💤 ±0  0 ±0 
260 runs  ±0  248 ✔️ ±0  12 💤 ±0  0 ±0 

Results for commit 829477e. ± Comparison against base commit 73fbf7a.

♻️ This comment has been updated with latest results.

@birschick-bq birschick-bq marked this pull request as ready for review September 29, 2022 22:56
src/odbc/CMakeLists.txt Outdated Show resolved Hide resolved
src/odbc/install/documentdb-odbc-bundle.wxs.in Outdated Show resolved Hide resolved
.github/workflows/win-build.yml Outdated Show resolved Hide resolved
src/JDBC_DRIVER_VERSION.txt Show resolved Hide resolved
.github/workflows/win-build.yml Outdated Show resolved Hide resolved
.github/workflows/win-build.yml Outdated Show resolved Hide resolved
scripts/build_windows.ps1 Outdated Show resolved Hide resolved
scripts/functions_win.ps1 Outdated Show resolved Hide resolved
@birschick-bq birschick-bq requested a review from alinaliBQ October 6, 2022 20:26
@github-actions
Copy link

github-actions bot commented Oct 6, 2022

Ubuntu 20.04 Debug Build Unit Test Results Check

Code Coverage

Package Line Rate Branch Rate Complexity Health
src.odbc.include.documentdb.odbc 41% 39% 0
src.odbc.include.documentdb.odbc.app 45% 0% 0
src.odbc.include.documentdb.odbc.binary 0% 0% 0
src.odbc.include.documentdb.odbc.cache.query 0% 0% 0
src.odbc.include.documentdb.odbc.common 62% 35% 0
src.odbc.include.documentdb.odbc.compute 0% 0% 0
src.odbc.include.documentdb.odbc.config 100% 50% 0
src.odbc.include.documentdb.odbc.diagnostic 82% 50% 0
src.odbc.include.documentdb.odbc.impl 0% 0% 0
src.odbc.include.documentdb.odbc.impl.binary 0% 0% 0
src.odbc.include.documentdb.odbc.impl.cache.query 0% 0% 0
src.odbc.include.documentdb.odbc.impl.cache.query.continuous 0% 0% 0
src.odbc.include.documentdb.odbc.impl.compute 0% 0% 0
src.odbc.include.documentdb.odbc.impl.interop 0% 0% 0
src.odbc.include.documentdb.odbc.jni 77% 39% 0
src.odbc.include.documentdb.odbc.meta 71% 50% 0
src.odbc.include.documentdb.odbc.query 20% 0% 0
src.odbc.include.documentdb.odbc.sql 50% 11% 0
src.odbc.include.documentdb.odbc.streaming 0% 0% 0
src.odbc.os.linux.include.documentdb.odbc.common 0% 0% 0
src.odbc.os.linux.src.common 34% 42% 0
src.odbc.src 47% 28% 0
src.odbc.src.app 25% 13% 0
src.odbc.src.binary 0% 0% 0
src.odbc.src.cluster 0% 0% 0
src.odbc.src.common 28% 18% 0
src.odbc.src.config 71% 45% 0
src.odbc.src.diagnostic 33% 12% 0
src.odbc.src.impl 0% 0% 0
src.odbc.src.impl.binary 0% 0% 0
src.odbc.src.impl.cache 0% 0% 0
src.odbc.src.impl.cache.query 0% 0% 0
src.odbc.src.impl.cache.query.continuous 0% 0% 0
src.odbc.src.impl.cluster 0% 0% 0
src.odbc.src.impl.compute 0% 0% 0
src.odbc.src.impl.interop 0% 0% 0
src.odbc.src.jni 63% 27% 0
src.odbc.src.jni.os.linux 38% 20% 0
src.odbc.src.meta 88% 54% 0
src.odbc.src.query 60% 27% 0
src.odbc.src.sql 18% 8% 0
src.odbc.src.streaming 0% 0% 0
Summary 38% (6001 / 15892) 25% (9170 / 37095) 0

@github-actions
Copy link

github-actions bot commented Oct 6, 2022

MacOS Big Sur 11 Debug Build Code Coverage Result

Code Coverage

Package Line Rate Branch Rate Complexity Health
src.odbc.include.documentdb.odbc 29% 37% 0
src.odbc.include.documentdb.odbc.app 20% 0% 0
src.odbc.include.documentdb.odbc.binary 0% 0% 0
src.odbc.include.documentdb.odbc.cache.query 0% 0% 0
src.odbc.include.documentdb.odbc.cluster 0% 0% 0
src.odbc.include.documentdb.odbc.common 13% 11% 0
src.odbc.include.documentdb.odbc.compute 0% 0% 0
src.odbc.include.documentdb.odbc.config 86% 50% 0
src.odbc.include.documentdb.odbc.diagnostic 86% 50% 0
src.odbc.include.documentdb.odbc.impl 0% 0% 0
src.odbc.include.documentdb.odbc.impl.binary 0% 0% 0
src.odbc.include.documentdb.odbc.impl.cache 0% 0% 0
src.odbc.include.documentdb.odbc.impl.cache.query 0% 0% 0
src.odbc.include.documentdb.odbc.impl.cache.query.continuous 0% 0% 0
src.odbc.include.documentdb.odbc.impl.compute 0% 0% 0
src.odbc.include.documentdb.odbc.impl.interop 0% 0% 0
src.odbc.include.documentdb.odbc.jni 48% 40% 0
src.odbc.include.documentdb.odbc.meta 47% 50% 0
src.odbc.include.documentdb.odbc.query 15% 0% 0
src.odbc.include.documentdb.odbc.sql 11% 0% 0
src.odbc.include.documentdb.odbc.streaming 0% 0% 0
src.odbc.os.linux.include.documentdb.odbc.common 0% 0% 0
src.odbc.os.linux.src.common 34% 35% 0
src.odbc.src 49% 28% 0
src.odbc.src.app 16% 3% 0
src.odbc.src.binary 0% 0% 0
src.odbc.src.cluster 2% 0% 0
src.odbc.src.common 22% 10% 0
src.odbc.src.config 71% 45% 0
src.odbc.src.diagnostic 44% 14% 0
src.odbc.src.impl 1% 0% 0
src.odbc.src.impl.binary 0% 0% 0
src.odbc.src.impl.cache 2% 0% 0
src.odbc.src.impl.cache.query 1% 0% 0
src.odbc.src.impl.cache.query.continuous 0% 0% 0
src.odbc.src.impl.cluster 2% 0% 0
src.odbc.src.impl.compute 0% 0% 0
src.odbc.src.impl.interop 1% 0% 0
src.odbc.src.jni 66% 26% 0
src.odbc.src.jni.os.linux 47% 23% 0
src.odbc.src.meta 89% 54% 0
src.odbc.src.query 64% 28% 0
src.odbc.src.sql 25% 9% 0
src.odbc.src.streaming 3% 0% 0
Summary 37% (6075 / 16332) 23% (9553 / 41950) 0

@github-actions
Copy link

github-actions bot commented Oct 6, 2022

Windows 2022 (x32) Debug Build Unit Test Results Check

Code Coverage

Package Line Rate Branch Rate Complexity Health
D:\a\amazon-documentdb-odbc-driver\amazon-documentdb-odbc-driver\build\odbc\bin\Debug\documentdb.odbc.dll 33% 0% 0
Summary 33% (6997 / 20982) 0% (0 / 0) 0

@birschick-bq birschick-bq merged commit 366339f into develop Oct 6, 2022
@birschick-bq birschick-bq deleted the birschick/ad-915/install-jre branch October 6, 2022 21:19
affonsov pushed a commit that referenced this pull request Nov 16, 2022
* [AD-915] Embed JRE into install. Simplify versioning of JDBC driver.

* [AD-915] Fixed setting the JDBC_DRIVER_VERSION

* [AD-915] Fixed setting the JDBC_DRIVER_VERSION

* [AD-915] Fixed setting the JDBC_DRIVER_VERSION

* [AD-915] Attempting to debug Windows 32-bit JDBC installer

* [AD-915] Attempting fix to Windows 32-bit JDBC installer

* [AD-915] Correct indentation formatting.

* [AD-915] Code review improvements.

* [AD-915] Temporary enable creating artifacts to get 32-bit installer.

* [AD-915] Remove unnecessary "verbose" on jpackage command.

* [AD-915] Fixed Platform setting in JDBC installer main.wxs.in

* [AD-915] Replace JDK installation with script on Windows.

* [AD-915] Attempt fix of JDK installation with script on Windows.

* [AD-915] Attempt fix of JDK installation with script on Windows.

* [AD-915] Increase tracing info for JDK installation with script on Windows.

* [AD-915] Change parameter to JDK installer script.

* [AD-915] Create JDKs directory, if not exists.

* [AD-915] Fix syntax - Create JDKs directory, if not exists.

* [AD-915] Fix location - Create JDKs directory, if not exists.

* [AD-915] Fix setting of JAVA_HOME environment variable in GitHub workflow.

* [AD-915] Get full path of JDKs folder.

* [AD-915] Fix Resolve-Path call.

* [AD-915] Add path to $JAVA_HOME/bin

* [AD-915] Refactor code to use 'jlink' and create a runtime image instead of application for 'jpackage'.

* [AD-915] Attempt to build Windows 32-bit installer using 'jpackage'.

* [AD-915] Attempt #2 to build Windows 32-bit installer using 'jpackage'.

* [AD-915] More clean-up and make release artifacts smaller/cleaner.

* [AD-915] Attempt to fix clean-up and make release artifacts smaller/cleaner.

* [AD-915] Attempt #2 to fix clean-up and make release artifacts smaller/cleaner.

* [AD-915] Attempt #3 to clean-up and make release artifacts smaller/cleaner.

* [AD-915] Attempt #4 to clean-up and make release artifacts smaller/cleaner.

* [AD-915] Remove commented unused code.

* [AD-915] Fix path to JVM.dll in JDBC installer template.

* [AD-915] Set artifacts to be made on push to the develop branch.

* [AD-915] Improve naming and version numbers for installer

* [AD-915] Remove unused icon file.

* [AD-915] Rename a installer resource for better clarity.

* [AD-915] Add tracing for JLINK_VERSION.

* [AD-915] Fix issue with JLINK_VERSION having more than 3 version components.

* [AD-915] Code review changes.

* [AD-915] Revert code to create artifacts - so now only on push to develop branch.
affonsov pushed a commit that referenced this pull request Nov 17, 2022
* [AD-915] Embed JRE into install. Simplify versioning of JDBC driver.

* [AD-915] Fixed setting the JDBC_DRIVER_VERSION

* [AD-915] Fixed setting the JDBC_DRIVER_VERSION

* [AD-915] Fixed setting the JDBC_DRIVER_VERSION

* [AD-915] Attempting to debug Windows 32-bit JDBC installer

* [AD-915] Attempting fix to Windows 32-bit JDBC installer

* [AD-915] Correct indentation formatting.

* [AD-915] Code review improvements.

* [AD-915] Temporary enable creating artifacts to get 32-bit installer.

* [AD-915] Remove unnecessary "verbose" on jpackage command.

* [AD-915] Fixed Platform setting in JDBC installer main.wxs.in

* [AD-915] Replace JDK installation with script on Windows.

* [AD-915] Attempt fix of JDK installation with script on Windows.

* [AD-915] Attempt fix of JDK installation with script on Windows.

* [AD-915] Increase tracing info for JDK installation with script on Windows.

* [AD-915] Change parameter to JDK installer script.

* [AD-915] Create JDKs directory, if not exists.

* [AD-915] Fix syntax - Create JDKs directory, if not exists.

* [AD-915] Fix location - Create JDKs directory, if not exists.

* [AD-915] Fix setting of JAVA_HOME environment variable in GitHub workflow.

* [AD-915] Get full path of JDKs folder.

* [AD-915] Fix Resolve-Path call.

* [AD-915] Add path to $JAVA_HOME/bin

* [AD-915] Refactor code to use 'jlink' and create a runtime image instead of application for 'jpackage'.

* [AD-915] Attempt to build Windows 32-bit installer using 'jpackage'.

* [AD-915] Attempt #2 to build Windows 32-bit installer using 'jpackage'.

* [AD-915] More clean-up and make release artifacts smaller/cleaner.

* [AD-915] Attempt to fix clean-up and make release artifacts smaller/cleaner.

* [AD-915] Attempt #2 to fix clean-up and make release artifacts smaller/cleaner.

* [AD-915] Attempt #3 to clean-up and make release artifacts smaller/cleaner.

* [AD-915] Attempt #4 to clean-up and make release artifacts smaller/cleaner.

* [AD-915] Remove commented unused code.

* [AD-915] Fix path to JVM.dll in JDBC installer template.

* [AD-915] Set artifacts to be made on push to the develop branch.

* [AD-915] Improve naming and version numbers for installer

* [AD-915] Remove unused icon file.

* [AD-915] Rename a installer resource for better clarity.

* [AD-915] Add tracing for JLINK_VERSION.

* [AD-915] Fix issue with JLINK_VERSION having more than 3 version components.

* [AD-915] Code review changes.

* [AD-915] Revert code to create artifacts - so now only on push to develop branch.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants