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
2 changes: 1 addition & 1 deletion .github/workflows/release-javascript.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '24'
registry-url: 'https://registry.npmjs.org'

- name: Upgrade npm for trusted publishing
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-rust.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
steps:
- uses: actions/checkout@v5

- uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable
- uses: dtolnay/rust-toolchain@4be7066ada62dd38de10e7b70166bc74ed198c30 # stable

- name: Bump rust version
shell: bash
Expand Down
7 changes: 6 additions & 1 deletion ci/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,12 @@ build_pyfory() {
}

install_pyarrow() {
$PIP_CMD install pyarrow numpy
# Newer PyArrow and NumPy Linux wheels require manylinux_2_28.
if [[ ${PLAT:-} == manylinux2014_* ]]; then
$PIP_CMD install "pyarrow<21" "numpy<2.3"
else
$PIP_CMD install pyarrow numpy
fi
}

deploy_scala() {
Expand Down
11 changes: 10 additions & 1 deletion ci/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,7 @@ def bump_rust_version(new_version):
rust_version,
_update_cargo_lock_version,
)
_bump_version("rust/fory/src", "lib.rs", rust_version, _update_rust_doc_version)


def bump_kotlin_version(new_version):
Expand Down Expand Up @@ -816,7 +817,7 @@ def _update_pom_parent_version(lines, new_version):
def _update_android_tests_dependency_version(lines, new_version):
for index, line in enumerate(lines):
lines[index] = re.sub(
r"(org\.apache\.fory:fory-(?:core|annotation-processor):)[^'`)\s]+",
r"(org\.apache\.fory:fory-(?:core|json|annotation-processor):)[^'`)\s]+",
r"\g<1>" + new_version,
line,
)
Expand Down Expand Up @@ -946,6 +947,14 @@ def _update_cargo_lock_version(lines, v: str):
return lines


def _update_rust_doc_version(lines, v: str):
for index, line in enumerate(lines):
if re.match(r'^//!\s+fory\s*=\s*"', line):
lines[index] = re.sub(r'"[^"]+"', f'"{v}"', line, count=1)
break
return lines


def _update_cmake_project_version(lines, v: str):
cmake_version = _normalize_cmake_version(v)
in_project = False
Expand Down
Loading