Skip to content

Build and CI maintenance #428

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

Merged
dmarcotte merged 4 commits into from
Sep 24, 2026
Merged

Build and CI maintenance #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f23ef17
Restrict native-image resource demands
dmarcotte Aug 24, 2026
be2117a
Normalize CRLF in JSONTestSuite when generating
holodorum Aug 24, 2026
34982ee
Run build-python-sdist on a large executor
holodorum Aug 24, 2026
43a7635
Run test-python-sdist-macos on Apple silicon
holodorum Aug 24, 2026
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
4 changes: 3 additions & 1 deletion .circleci/config.kson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ jobs:
docker:
- image: 'cimg/python:3.11'
.
resource_class: large
working_directory: '~/repo'
steps:
- checkout
Expand Down Expand Up @@ -427,8 +428,9 @@ jobs:
.
'test-python-sdist-macos':
macos:
xcode: '14.2.0'
xcode: '16.4.0'
.
resource_class: 'm4pro.medium'
working_directory: '~/repo'
steps:
- 'setup-python-test':
Expand Down
4 changes: 3 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ jobs:
"build-python-sdist":
docker:
- image: "cimg/python:3.11"
resource_class: large
working_directory: "~/repo"
steps:
- checkout
Expand Down Expand Up @@ -383,7 +384,8 @@ jobs:

"test-python-sdist-macos":
macos:
xcode: "14.2.0"
xcode: "16.4.0"
resource_class: "m4pro.medium"
working_directory: "~/repo"
steps:
- "setup-python-test":
Expand Down
6 changes: 4 additions & 2 deletions buildSrc/src/main/kotlin/org/kson/jsonsuite/JsonTestSuiteGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,8 +349,10 @@ private class JsonTestDataLoader(private val testDefinitionFilesDir: Path, priva
return testFiles.map {
JsonTestData(
it.nameWithoutExtension,
// explicitly note UTF-8 here since the JSON spec specifies that as the proper json encoding
it.readText(Charsets.UTF_8),
// explicitly note UTF-8 here since the JSON spec specifies that as the proper json encoding.
// Normalize CRLF: the checkout test suite has no `.gitattributes`, so `core.autocrlf` on Windows
// would otherwise leak CRLFs into the generated file
it.readText(Charsets.UTF_8).replace("\r\n", "\n"),
it.absolutePath.replace(File.separatorChar, '/').replace("${projectRoot.toString().replace(File.separatorChar, '/')}/", ""),
JsonTestSuiteEditList.get(it.name)
)
Expand Down
4 changes: 4 additions & 0 deletions kson-lib/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,10 @@ tasks.register<PixiExecTask>("buildWithGraalVmNativeImage") {

buildList {
add(nativeImageExe.absolutePath)
// Restrict the resources `native-image` tries to reserve so that it doesn't accidentally ask for too
// much and blow up the build
add("-J-Xmx2560m")
add("--parallelism=2")
add("--shared")
add("-cp"); add(classPath)
add("-H:+UnlockExperimentalVMOptions") // Necessary to use JNIConfigurationFiles option below
Expand Down