This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new 9d08811 ci: fix versioning of wheels in CI (#214)
9d08811 is described below
commit 9d08811abca95ce333fef8e95445460f126c7f7c
Author: David Li <[email protected]>
AuthorDate: Sat Dec 3 14:00:27 2022 -0500
ci: fix versioning of wheels in CI (#214)
---
.github/workflows/packaging-wheels.yml | 46 +++++++++++++++++++++++++++----
ci/scripts/python_wheel_unix_build.sh | 7 ++++-
ci/scripts/python_wheel_windows_build.bat | 3 ++
3 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/packaging-wheels.yml
b/.github/workflows/packaging-wheels.yml
index 78407cf..74ff66a 100644
--- a/.github/workflows/packaging-wheels.yml
+++ b/.github/workflows/packaging-wheels.yml
@@ -34,6 +34,10 @@ on:
type: boolean
default: false
+concurrency:
+ group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
+ cancel-in-progress: true
+
jobs:
docs:
name: "Documentation"
@@ -42,7 +46,12 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- persist-credentials: false
+ persist-credentials: true
+
+ - name: Update tags
+ shell: bash
+ run: |
+ git fetch --tags --force origin
- name: Show inputs
shell: bash
@@ -76,7 +85,12 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- persist-credentials: false
+ persist-credentials: true
+
+ - name: Update tags
+ shell: bash
+ run: |
+ git fetch --tags --force origin
- name: Show inputs
shell: bash
@@ -121,7 +135,12 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- persist-credentials: false
+ persist-credentials: true
+
+ - name: Update tags
+ shell: bash
+ run: |
+ git fetch --tags --force origin
- name: Show inputs
shell: bash
@@ -182,7 +201,12 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- persist-credentials: false
+ persist-credentials: true
+
+ - name: Update tags
+ shell: bash
+ run: |
+ git fetch --tags --force origin
- name: Show inputs
shell: bash
@@ -263,7 +287,12 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- persist-credentials: false
+ persist-credentials: true
+
+ - name: Update tags
+ shell: bash
+ run: |
+ git fetch --tags --force origin
- name: Show inputs
shell: pwsh
@@ -340,7 +369,12 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- persist-credentials: false
+ persist-credentials: true
+
+ - name: Update tags
+ shell: bash
+ run: |
+ git fetch --tags --force origin
- name: Show inputs
shell: bash
diff --git a/ci/scripts/python_wheel_unix_build.sh
b/ci/scripts/python_wheel_unix_build.sh
index ad5566d..0ca0e59 100755
--- a/ci/scripts/python_wheel_unix_build.sh
+++ b/ci/scripts/python_wheel_unix_build.sh
@@ -76,9 +76,14 @@ PLAT_NAME=$(python -c "import sysconfig;
print(sysconfig.get_platform())")
for component in $COMPONENTS; do
pushd ${source_dir}/python/$component
- echo "=== (${PYTHON_VERSION}) Clean build artifacts==="
+ echo "=== (${PYTHON_VERSION}) Clean build artifacts ==="
rm -rf ./build ./dist ./repaired_wheels ./$component/*.so
./$component/*.so.*
+ echo "=== (${PYTHON_VERSION}) Check $component version ==="
+ python $component/_version.py
+ git describe --long --always --first-parent
+ git describe --long --always
+
echo "=== (${PYTHON_VERSION}) Building $component wheel ==="
# python -m build copies to a tempdir, so we can't reference other files
in the repo
python -m pip wheel -w dist -vvv .
diff --git a/ci/scripts/python_wheel_windows_build.bat
b/ci/scripts/python_wheel_windows_build.bat
index 76a598b..832940e 100644
--- a/ci/scripts/python_wheel_windows_build.bat
+++ b/ci/scripts/python_wheel_windows_build.bat
@@ -79,6 +79,9 @@ FOR /F %%i IN ('python -c "import sysconfig;
print(sysconfig.get_platform())"')
FOR %%c IN (adbc_driver_manager adbc_driver_postgres adbc_driver_sqlite) DO (
pushd %source_dir%\python\%%c
+ echo "=== (%PYTHON_VERSION%) Checking %%c version ==="
+ python %%c\_version.py
+
echo "=== (%PYTHON_VERSION%) Building %%c wheel ==="
python -m pip wheel -w dist -vvv . || exit /B 1
