Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 15 additions & 11 deletions .github/workflows/javascript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ jobs:
target: aarch64-apple-darwin
- host: windows-latest
target: x86_64-pc-windows-msvc
- host: windows-11-arm
target: aarch64-pc-windows-msvc

This comment was marked as resolved.

This comment was marked as resolved.

- host: ubuntu-latest
target: x86_64-unknown-linux-gnu
- host: ubuntu-24.04-arm
Expand Down Expand Up @@ -149,6 +151,8 @@ jobs:
target: aarch64-apple-darwin
- host: windows-latest
target: x86_64-pc-windows-msvc
- host: windows-11-arm
target: aarch64-pc-windows-msvc
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
Expand All @@ -168,21 +172,21 @@ jobs:
with:
name: bindings-${{ matrix.settings.target }}
path: javascript
- name: Setup conda (Windows)
if: runner.os == 'Windows'
uses: conda-incubator/setup-miniconda@8ee1f361103df19b6f8c8655fd3967a8ecb162d5 # v4.0.1
with:
miniforge-version: latest
- name: Install C++ dependencies (Windows)
# SQLite is the only dependency the test driver build needs, so take
# it from the runner's preinstalled vcpkg (present on both the x64 and
# arm64 images) rather than conda. The static-md triplet links SQLite
# into the driver DLL, so nothing extra has to go on PATH at runtime.
if: runner.os == 'Windows'
run: conda install -c conda-forge --file ci/conda_env_cpp.txt
shell: pwsh
run: |
$triplet = if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64') { 'arm64-windows-static-md' } else { 'x64-windows-static-md' }
& "$env:VCPKG_INSTALLATION_ROOT\vcpkg.exe" install "sqlite3:$triplet"
$toolchain = "$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" -replace '\\', '/'
echo "ADBC_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=$toolchain -DVCPKG_TARGET_TRIPLET=$triplet" >> $env:GITHUB_ENV
- name: Install C++ dependencies (Linux)
if: runner.os == 'Linux'
run: sudo apt-get install libsqlite3-dev
- name: Set cmake args (Windows)
if: runner.os == 'Windows'
shell: pwsh
run: echo "ADBC_CMAKE_ARGS=-DCMAKE_PREFIX_PATH=$env:CONDA_PREFIX/Library" >> $env:GITHUB_ENV
- name: Build Driver
# We need to build the SQLite driver for tests.
shell: bash
Expand All @@ -197,7 +201,7 @@ jobs:
if: runner.os == 'Windows'
shell: pwsh
run: |
echo "PATH=${{ github.workspace }}/javascript/build/bin;$env:CONDA_PREFIX\Library\bin;$env:PATH" >> $env:GITHUB_ENV
echo "PATH=${{ github.workspace }}/javascript/build/bin;$env:PATH" >> $env:GITHUB_ENV
echo "ADBC_DRIVER_MANAGER_TEST_LIB=${{ github.workspace }}/javascript/build/bin/adbc_driver_sqlite.dll" >> $env:GITHUB_ENV
- name: Run Tests
working-directory: javascript
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1124,6 +1124,8 @@ jobs:
target: aarch64-apple-darwin
- host: windows-latest
target: x86_64-pc-windows-msvc
- host: windows-11-arm
target: aarch64-pc-windows-msvc
- host: ubuntu-latest
target: x86_64-unknown-linux-gnu
- host: ubuntu-24.04-arm
Expand Down
3 changes: 3 additions & 0 deletions javascript/.cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@

[target.x86_64-pc-windows-msvc]
rustflags = ["-C", "target-feature=+crt-static"]

[target.aarch64-pc-windows-msvc]
rustflags = ["-C", "target-feature=+crt-static"]
22 changes: 22 additions & 0 deletions javascript/npm/win32-arm64-msvc/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<!---
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->

# `adbc-driver-manager-win32-arm64-msvc`

This is the **aarch64-pc-windows-msvc** binary for `adbc-driver-manager`
24 changes: 24 additions & 0 deletions javascript/npm/win32-arm64-msvc/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"name": "@apache-arrow/adbc-driver-manager-win32-arm64-msvc",
"version": "0.25.0",
"cpu": [
"arm64"
],
"main": "adbc-driver-manager.win32-arm64-msvc.node",
"files": [
"adbc-driver-manager.win32-arm64-msvc.node"
],
"description": "Node.js ADBC Driver Manager",
"license": "Apache-2.0",
"engines": {
"node": ">=22.0.0"
},
"repository": {
"type": "git",
"url": "git+https://github.com/apache/arrow-adbc.git",
"directory": "javascript"
},
"os": [
"win32"
]
}
1 change: 1 addition & 0 deletions javascript/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions javascript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"binaryName": "adbc-driver-manager",
"targets": [
"x86_64-pc-windows-msvc",
"aarch64-pc-windows-msvc",
"x86_64-apple-darwin",
"x86_64-unknown-linux-gnu",
"aarch64-unknown-linux-gnu",
Expand Down Expand Up @@ -86,6 +87,7 @@
},
"optionalDependencies": {
"@apache-arrow/adbc-driver-manager-win32-x64-msvc": "0.25.0",
"@apache-arrow/adbc-driver-manager-win32-arm64-msvc": "0.25.0",
"@apache-arrow/adbc-driver-manager-darwin-x64": "0.25.0",
"@apache-arrow/adbc-driver-manager-linux-x64-gnu": "0.25.0",
"@apache-arrow/adbc-driver-manager-linux-arm64-gnu": "0.25.0",
Expand Down
Loading