Skip to content

Commit f257f37

Browse files
authored
fix(ci): Don't set development version for wheel on a release branch and fix Windows wheel builds (#93)
1 parent 338d369 commit f257f37

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

.github/workflows/python-wheels.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626
push:
2727
branches:
2828
- main
29-
- 'maint-**'
29+
- 'branch-**'
3030
workflow_dispatch:
3131

3232
permissions:
@@ -70,8 +70,15 @@ jobs:
7070
path: vcpkg
7171

7272
- name: Set SedonaDB dev version
73+
shell: bash
7374
run: |
74-
python ci/scripts/set_dev_version.py
75+
# Set the unique development version anywhere except a release branch
76+
if [[ "${GITHUB_REF##*/}" =~ ^branch-[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
77+
version="${GITHUB_REF##*/branch-}"
78+
echo "${version}"
79+
else
80+
python ci/scripts/set_dev_version.py
81+
fi
7582
7683
- name: Build and test wheels (sedonadb)
7784
run: |

c/sedona-proj/src/proj.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ impl ProjContext {
140140
/// - PJ_LOG_LEVEL_PJ_LOG_TELL (4): Tell
141141
pub(crate) fn set_log_level(&self, level: u32) -> Result<(), SedonaProjError> {
142142
unsafe {
143-
call_proj_api!(self.api, proj_log_level, self.inner, level);
143+
call_proj_api!(self.api, proj_log_level, self.inner, level as _);
144144
}
145145
Ok(())
146146
}

0 commit comments

Comments
 (0)