Skip to content

Commit 1803663

Browse files
committed
fix win64
1 parent 85c493e commit 1803663

2 files changed

Lines changed: 12 additions & 14 deletions

File tree

.github/workflows/release.yml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969

7070
build-typescript-release:
7171
uses: ./.github/workflows/build-typescript-release.reusable.yaml
72-
72+
7373
build-cli:
7474
needs: determine-version
7575
uses: ./.github/workflows/build-cli-release.reusable.yaml
@@ -79,14 +79,14 @@ jobs:
7979

8080
# This job now calls the reusable workflow which contains the matrix strategy
8181
build-vscode-reusable: # Renamed job for clarity
82-
needs: [ determine-version, build-cli ]
82+
needs: [determine-version, build-cli]
8383
uses: ./.github/workflows/build-vscode-release.reusable.yaml
8484
with:
8585
# No artifact_name needed here anymore
8686
version: ${{ needs.determine-version.outputs.version_string }}
8787
# Pass the boolean output directly
8888
is_release_build: ${{ needs.determine-version.outputs.is_release_tag == 'true' }}
89-
89+
9090
# Kick off integration tests when we build everything.
9191
# This does not yet succeed/pass consistently, or even run everything, but it's a good start.
9292
integ-tests:
@@ -105,7 +105,6 @@ jobs:
105105
- build-vscode-reusable # Depends on the job calling the reusable workflow
106106
steps:
107107
- run: echo "::do-nothing::" >/dev/null
108-
109108

110109
publish-to-pypi:
111110
environment: release
@@ -129,8 +128,8 @@ jobs:
129128
set -euo pipefail
130129
ls dist/
131130
wheel_count=$(ls dist/*.whl 2>/dev/null | wc -l)
132-
if [ "$wheel_count" -lt 7 ]; then
133-
echo "Error: Expected at least 7 wheels, but found $wheel_count"
131+
if [ "$wheel_count" -lt 8 ]; then
132+
echo "Error: Expected at least 8 wheels, but found $wheel_count"
134133
exit 1
135134
fi
136135
echo "Found $wheel_count wheels"
@@ -223,8 +222,6 @@ jobs:
223222
gem push $i
224223
done
225224
226-
227-
228225
publish-to-open-vsx:
229226
environment: release
230227
needs: [determine-version, all-builds] # Also need determine-version for the condition
@@ -308,19 +305,19 @@ jobs:
308305
uses: actions/download-artifact@v4
309306
with:
310307
# Match artifacts starting with 'baml-cli-'
311-
pattern: baml-cli-*
308+
pattern: baml-cli-*
312309
# Download into this directory
313-
path: cli-artifacts
310+
path: cli-artifacts
314311
merge-multiple: true # Merge artifacts from different OS/arch into the path
315312

316313
# Download all CFFI library artifacts produced by the build-cli job
317314
- name: Download all libbaml-cffi artifacts
318315
uses: actions/download-artifact@v4
319316
with:
320317
# Match artifacts starting with 'libbaml-cffi-'
321-
pattern: libbaml-cffi-*
318+
pattern: libbaml-cffi-*
322319
# Download into a separate directory
323-
path: cffi-artifacts
320+
path: cffi-artifacts
324321
merge-multiple: true # Merge artifacts from different OS into the path
325322

326323
- name: List downloaded CLI artifacts
@@ -369,4 +366,4 @@ jobs:
369366
# Use default GITHUB_TOKEN
370367
token: ${{ secrets.GITHUB_TOKEN }}
371368
# Do not auto-generate release notes, rely on changelog or empty body
372-
generate_release_notes: false
369+
generate_release_notes: false

engine/language_client_python/pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ build-backend = "maturin"
1515
[tool.maturin]
1616
python-source = "python_src"
1717
# "extension-module" tells pyo3 we want to build an extension module (skips linking against libpython.so).
18-
features = ["pyo3/extension-module"]
18+
# The second feature is to fix windows aarch64 https://github.com/samuelcolvin/rtoml/pull/73/files
19+
features = ["pyo3/extension-module", "pyo3/generate-import-lib"]
1920

2021
[project.scripts]
2122
baml-cli = "baml_py:invoke_runtime_cli"

0 commit comments

Comments
 (0)