Skip to content

Commit 54ccd1a

Browse files
authored
Enable Standard.AWS and Standard.Microsoft in native image (#12156)
* 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
1 parent 166ad90 commit 54ccd1a

File tree

4 files changed

+31
-4
lines changed

4 files changed

+31
-4
lines changed

build.sbt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3787,7 +3787,12 @@ lazy val `engine-runner` = project
37873787
`base-polyglot-root`.listFiles("*.jar").map(_.getAbsolutePath()) ++
37883788
`image-polyglot-root`.listFiles("*.jar").map(_.getAbsolutePath()) ++
37893789
`table-polyglot-root`.listFiles("*.jar").map(_.getAbsolutePath()) ++
3790-
`database-polyglot-root`.listFiles("*.jar").map(_.getAbsolutePath())
3790+
`database-polyglot-root`.listFiles("*.jar").map(_.getAbsolutePath()) ++
3791+
`std-aws-polyglot-root`.listFiles("*.jar").map(_.getAbsolutePath()) ++
3792+
`std-microsoft-polyglot-root`
3793+
.listFiles("*.jar")
3794+
.map(_.getAbsolutePath())
3795+
37913796
core ++ stdLibsJars
37923797
},
37933798
buildSmallJdk := {
@@ -3905,7 +3910,8 @@ lazy val `engine-runner` = project
39053910
"org.enso.image",
39063911
"org.enso.table",
39073912
"org.enso.database",
3908-
"org.eclipse.jgit"
3913+
"org.eclipse.jgit",
3914+
"com.amazonaws"
39093915
)
39103916
)
39113917
}

build_tools/build/src/engine/context.rs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,6 +702,18 @@ pub async fn runner_sanity_test(
702702
.run_ok()
703703
.await;
704704

705+
let test_aws = Command::new(&enso)
706+
.args(["--run", repo_root.test.join("AWS_Tests").as_str()])
707+
.set_env(ENSO_DATA_DIRECTORY, engine_package)?
708+
.run_ok()
709+
.await;
710+
711+
let test_microsoft = Command::new(&enso)
712+
.args(["--run", repo_root.test.join("Microsoft_Tests").as_str()])
713+
.set_env(ENSO_DATA_DIRECTORY, engine_package)?
714+
.run_ok()
715+
.await;
716+
705717
let test_geo = Command::new(&enso)
706718
.args(["--run", repo_root.test.join("Geo_Tests").as_str()])
707719
.set_env(ENSO_DATA_DIRECTORY, engine_package)?
@@ -714,7 +726,7 @@ pub async fn runner_sanity_test(
714726
.run_ok()
715727
.await;
716728

717-
let all_cmds = test_base.and(test_internal_base).and(test_table).and(test_geo).and(test_image);
729+
let all_cmds = test_base.and(test_internal_base).and(test_table).and(test_aws).and(test_microsoft).and(test_geo).and(test_image);
718730

719731
// The following test does not actually run anything, it just checks if the engine
720732
// can accept `--jvm` argument and evaluates something.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"resources":{
3+
"includes":[{
4+
"pattern":"\\QMETA-INF/java.sql.Driver\\E"
5+
}]},
6+
"bundles":[{
7+
"name": "com.microsoft.sqlserver.jdbc.SQLServerResource"
8+
}]
9+
}

test/Microsoft_Tests/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Please set the following environment variables:
1010
- 'ENSO_SQLSERVER_HOST' - the name of the server hosting SQLServer,
1111
- 'ENSO_SQLSERVER_PORT' - the port SQLServer is on,
1212
- 'ENSO_SQLSERVER_USER' - the user name to use to connect,
13-
- 'ENSO_SQLSERVER_PASSWORD' - the pasword for that user,
13+
- 'ENSO_SQLSERVER_PASSWORD' - the password for that user,
1414
- 'ENSO_SQLSERVER_DATABASE' - the database on the SQLServer to use.
1515

1616
## Docker

0 commit comments

Comments
 (0)