Skip to content
Open
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
32 changes: 29 additions & 3 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 @@ -169,18 +173,40 @@ jobs:
name: bindings-${{ matrix.settings.target }}
path: javascript
- name: Setup conda (Windows)
if: runner.os == 'Windows'
# Miniforge does not publish a Windows ARM64 installer, so the ARM64
# leg uses micromamba (which ships native arm64 binaries) below.
if: runner.os == 'Windows' && runner.arch != 'ARM64'
uses: conda-incubator/setup-miniconda@8ee1f361103df19b6f8c8655fd3967a8ecb162d5 # v4.0.1
Comment on lines 175 to 179

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the micromamba rework, CONDA_PREFIX is now defined on the ARM64 leg
too (pointing at the micromamba env), and its Library\bin on PATH is
needed there for sqlite3.dll, so the shared step is correct for both
Windows legs.

with:
miniforge-version: latest
- name: Install C++ dependencies (Windows)
if: runner.os == 'Windows'
if: runner.os == 'Windows' && runner.arch != 'ARM64'
run: conda install -c conda-forge --file ci/conda_env_cpp.txt
Comment on lines +183 to 184

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As @eitsupi points out if we can use setup-micromamba and stay consistent that would be ideal.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done — the win-arm64 test leg now uses the conda-forge flow via micromamba
instead of vcpkg (562b35c). Two notes on the implementation:

  • mamba-org/setup-micromamba is not on the ASF actions allowlist
    (approved_patterns.yml
    only has conda-incubator/setup-miniconda), so the step downloads the
    official micromamba-win-arm64.exe from mamba-org/micromamba-releases
    directly, pinned to 2.8.1-0 with a sha256 check. If you'd rather get
    setup-micromamba added to the allowlist and use the action, happy to
    switch — this seemed like the lower-friction path for now.
  • conda-forge's win-arm64 platform doesn't have cmake, compilers,
    libpq, or pkg-config yet, so the leg installs just libsqlite (what
    the test driver build needs) and uses the runner's preinstalled MSVC and
    CMake rather than the full ci/conda_env_cpp.txt.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't really want to work around the allowlist...we should get it added.

- name: Install C++ dependencies (Windows ARM64)
# mamba-org/setup-micromamba is not on the ASF actions allowlist, so
# fetch the official micromamba binary directly (pinned + checksummed).
# conda-forge's win-arm64 platform does not have cmake, compilers,
# libpq, or pkg-config yet, so install just what the SQLite driver
# build needs and use the runner's preinstalled MSVC and CMake.
# CONDA_PREFIX is exported so the shared "Set driver path (Windows)"
# step puts the env's Library\bin (sqlite3.dll) on PATH.
if: runner.os == 'Windows' && runner.arch == 'ARM64'
shell: pwsh
run: |
$version = "2.8.1-0"
$sha256 = "c90eda5e4c88ebd4fb4c857d7c98d7484156fae5419b72c9c652f331ad7aad9f"
$exe = "$env:RUNNER_TEMP\micromamba.exe"
Invoke-WebRequest -Uri "https://github.com/mamba-org/micromamba-releases/releases/download/$version/micromamba-win-arm64.exe" -OutFile $exe
if ((Get-FileHash $exe -Algorithm SHA256).Hash -ne $sha256) { throw "micromamba checksum mismatch" }
$prefix = "$env:RUNNER_TEMP\conda-env"
& $exe create --yes --prefix $prefix --channel conda-forge libsqlite
echo "CONDA_PREFIX=$prefix" >> $env:GITHUB_ENV
echo "ADBC_CMAKE_ARGS=-DCMAKE_PREFIX_PATH=$($prefix -replace '\\','/')/Library" >> $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'
if: runner.os == 'Windows' && runner.arch != 'ARM64'
shell: pwsh
run: echo "ADBC_CMAKE_ARGS=-DCMAKE_PREFIX_PATH=$env:CONDA_PREFIX/Library" >> $env:GITHUB_ENV
- name: Build Driver
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