Skip to content

Commit

Permalink
Enable Standard.AWS and Standard.Microsoft in native image (#12156)
Browse files Browse the repository at this point in the history
* Enable Standard.AWS in native image

`com.amazonaws` was required to be initialized at runtime due to
logging being already present on that list.
Closes #12149.

* Add Standard.Microsoft

* update CI

* revert accidental change

* Update resources for Microsoft

* fmt
  • Loading branch information
hubertp authored Jan 29, 2025
1 parent 166ad90 commit 54ccd1a
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 4 deletions.
10 changes: 8 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3787,7 +3787,12 @@ lazy val `engine-runner` = project
`base-polyglot-root`.listFiles("*.jar").map(_.getAbsolutePath()) ++
`image-polyglot-root`.listFiles("*.jar").map(_.getAbsolutePath()) ++
`table-polyglot-root`.listFiles("*.jar").map(_.getAbsolutePath()) ++
`database-polyglot-root`.listFiles("*.jar").map(_.getAbsolutePath())
`database-polyglot-root`.listFiles("*.jar").map(_.getAbsolutePath()) ++
`std-aws-polyglot-root`.listFiles("*.jar").map(_.getAbsolutePath()) ++
`std-microsoft-polyglot-root`
.listFiles("*.jar")
.map(_.getAbsolutePath())

core ++ stdLibsJars
},
buildSmallJdk := {
Expand Down Expand Up @@ -3905,7 +3910,8 @@ lazy val `engine-runner` = project
"org.enso.image",
"org.enso.table",
"org.enso.database",
"org.eclipse.jgit"
"org.eclipse.jgit",
"com.amazonaws"
)
)
}
Expand Down
14 changes: 13 additions & 1 deletion build_tools/build/src/engine/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -702,6 +702,18 @@ pub async fn runner_sanity_test(
.run_ok()
.await;

let test_aws = Command::new(&enso)
.args(["--run", repo_root.test.join("AWS_Tests").as_str()])
.set_env(ENSO_DATA_DIRECTORY, engine_package)?
.run_ok()
.await;

let test_microsoft = Command::new(&enso)
.args(["--run", repo_root.test.join("Microsoft_Tests").as_str()])
.set_env(ENSO_DATA_DIRECTORY, engine_package)?
.run_ok()
.await;

let test_geo = Command::new(&enso)
.args(["--run", repo_root.test.join("Geo_Tests").as_str()])
.set_env(ENSO_DATA_DIRECTORY, engine_package)?
Expand All @@ -714,7 +726,7 @@ pub async fn runner_sanity_test(
.run_ok()
.await;

let all_cmds = test_base.and(test_internal_base).and(test_table).and(test_geo).and(test_image);
let all_cmds = test_base.and(test_internal_base).and(test_table).and(test_aws).and(test_microsoft).and(test_geo).and(test_image);

// The following test does not actually run anything, it just checks if the engine
// can accept `--jvm` argument and evaluates something.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"resources":{
"includes":[{
"pattern":"\\QMETA-INF/java.sql.Driver\\E"
}]},
"bundles":[{
"name": "com.microsoft.sqlserver.jdbc.SQLServerResource"
}]
}
2 changes: 1 addition & 1 deletion test/Microsoft_Tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Please set the following environment variables:
- 'ENSO_SQLSERVER_HOST' - the name of the server hosting SQLServer,
- 'ENSO_SQLSERVER_PORT' - the port SQLServer is on,
- 'ENSO_SQLSERVER_USER' - the user name to use to connect,
- 'ENSO_SQLSERVER_PASSWORD' - the pasword for that user,
- 'ENSO_SQLSERVER_PASSWORD' - the password for that user,
- 'ENSO_SQLSERVER_DATABASE' - the database on the SQLServer to use.

## Docker
Expand Down

0 comments on commit 54ccd1a

Please sign in to comment.