Skip to content

Commit d333e97

Browse files
committed
Test encryption package with Windows on arm
1 parent dd0e701 commit d333e97

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

.github/workflows/test.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Gradle build & test
22

33
on:
44
push:
5-
branches: [ "main" ]
5+
branches: [ "main", "simple-windows-arm" ]
66
pull_request:
77
branches: [ "main" ]
88
workflow_call:
@@ -38,6 +38,9 @@ jobs:
3838
- os: windows-latest
3939
name: windows
4040
targets: jvmTest
41+
- os: windows-11-arm
42+
name: windows-arm-wip
43+
targets: "sqlite3multipleciphers:jvmTest"
4144
runs-on: ${{ matrix.os }}
4245
name: Test ${{ matrix.name }}
4346
timeout-minutes: 30
@@ -74,7 +77,7 @@ jobs:
7477

7578
- name: Build and run tests with Gradle
7679
run: |
77-
./gradlew --scan -PhasPrebuiltAssets=true \
80+
./gradlew --scan --configure-on-demand -PhasPrebuiltAssets=true \
7881
${{ matrix.targets }}
7982
shell: bash
8083

common/build.gradle.kts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ val downloadPowersyncDesktopBinaries by tasks.registering(Download::class) {
3939
"https://github.com/powersync-ja/powersync-sqlite-core/releases/download/v$coreVersion/libpowersync_aarch64.macos.dylib"
4040
val macos_x64 =
4141
"https://github.com/powersync-ja/powersync-sqlite-core/releases/download/v$coreVersion/libpowersync_x64.macos.dylib"
42+
val windows_aarch64 =
43+
"https://github.com/powersync-ja/powersync-sqlite-core/releases/download/v$coreVersion/powersync_aarch64.dll"
4244
val windows_x64 =
4345
"https://github.com/powersync-ja/powersync-sqlite-core/releases/download/v$coreVersion/powersync_x64.dll"
4446

@@ -51,20 +53,20 @@ val downloadPowersyncDesktopBinaries by tasks.registering(Download::class) {
5153
// We're not compiling native code for JVM builds here (we're doing that for Android only), so we just have to
5254
// fetch prebuilt binaries from the powersync-sqlite-core repository.
5355
if (includeAllPlatformsForJvmBuild) {
54-
src(listOf(linux_aarch64, linux_x64, macos_aarch64, macos_x64, windows_x64))
56+
src(listOf(linux_aarch64, linux_x64, macos_aarch64, macos_x64, windows_aarch64, windows_x64))
5557
} else {
5658
val (aarch64, x64) =
5759
when {
5860
os.isLinux -> linux_aarch64 to linux_x64
5961
os.isMacOsX -> macos_aarch64 to macos_x64
60-
os.isWindows -> null to windows_x64
62+
os.isWindows -> windows_aarch64 to windows_x64
6163
else -> error("Unknown operating system: $os")
6264
}
6365
val arch = System.getProperty("os.arch")
6466
src(
6567
when (arch) {
66-
"aarch64" -> listOfNotNull(aarch64)
67-
"amd64", "x86_64" -> listOfNotNull(x64)
68+
"aarch64" -> listOf(aarch64)
69+
"amd64", "x86_64" -> listOf(x64)
6870
else -> error("Unsupported architecture: $arch")
6971
},
7072
)

0 commit comments

Comments
 (0)