Skip to content

Commit

Permalink
cleanup code
Browse files Browse the repository at this point in the history
- remove 32b windows build - Not supported in manylixnux_2_28
- Python bindings for 3.12 were tested and work fine in Linux.
- Enable all azure-pipelines.yml jobs
- NOTE: should artifacts be published when pushing code to staging/ci? - easier to test CI output
  • Loading branch information
Adrian-Stanea committed Dec 13, 2023
1 parent cefb4e0 commit 294a7c5
Show file tree
Hide file tree
Showing 4 changed files with 178 additions and 213 deletions.
42 changes: 5 additions & 37 deletions .github/scripts/install_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,16 @@ LIBIIO_VERSION=libiio-v0
PACKAGE_DIR=${1-build}
echo $PACKAGE_DIR

echo "Calling update - SKIPPED"
# apt-get -y update
yum -y update
echo "## Installing dependencies"

yum install -y bzip2 gzip rpm rpm-build git wget tar \
libxml2-devel libusbx-devel libusb-devel doxygen libaio-devel avahi-devel avahi-tools graphviz swig flex bison \
python3 python3-devel python3-setuptools python3-pip

echo "Installing dependencies"
# apt-get install -y git wget tar graphviz libavahi-common-dev libavahi-client-dev libaio-dev libusb-1.0-0-dev libxml2-dev rpm tar bzip2 gzip flex bison git swig python3 python3-dev python3-setuptools python3-pip python3-all libserialport-dev
yum -y groupinstall 'Development Tools'
yum -y install yum-utils
yum config-manager --set-enabled powertools # not available on manylinux2014
yum -y install libxml2-devel libusbx-devel libusb-devel doxygen libaio-devel avahi-devel bzip2 gzip rpm rpm-build swig
# libusbx-devel libusb-devel # REPLACE ** libusb1-devel ** with this on centOS7

yum install -y git wget tar graphviz avahi-devel avahi-tools libaio-devel libusb1-devel libxml2-devel rpm tar bzip2 gzip flex bison git swig python3 python3-devel python3-setuptools python3-pip rpm-build

# On CentOS 8, avahi-devel & doxygen are in this repo; enable it
# yum -y install yum-utils
# yum config-manager --set-enabled powertools
# yum -y install libxml2-devel libusb1-devel doxygen libaio-devel avahi-devel bzip2 gzip rpm rpm-build swig


# THE below deps work on centOS7 without USB backend
# yum install -y git wget tar graphviz avahi-devel avahi-tools libaio-devel libusbx-devel libusb1-devel libxml2-devel bzip2 gzip flex bison git swig python3 python3-devel python3-setuptools python3-pip # libserialport-dev

# yum config-manager --set-enabled powertools
# yum install -y git wget tar graphviz avahi-devel avahi-tools libaio-devel libusb1-devel libxml2-devel rpm tar bzip2 gzip flex bison git swig python3 python3-devel python3-setuptools python3-pip rpm-build

# pip3 install --upgrade pip # Needed to reproduce in local image
echo "Installing cmake with pip"
python3 -m pip install cmake
cmake --version

# Install libserialport => not available from yum``
# yum install -y libtool autoconf
# git clone https://github.com/martinling/libserialport.git
# cd libserialport
# ./autogen.sh
# ./configure
# make
# make install

#Install libiio
echo "## Building libiio $LIBIIO_VERSION"
git clone -b $LIBIIO_VERSION --single-branch --depth 1 https://github.com/analogdevicesinc/libiio.git libiio
Expand Down Expand Up @@ -78,8 +47,7 @@ make
cat setup.py
make install

echo "## Content from build folder"
ls
# Repair wheel step fails if it does not find the .so file
echo "## Content from src folder"
ls ./src
echo "creating links to .so"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ jobs:
cibuildwheel --output-dir ${{ github.workspace }}/wheelhouse ${{ github.workspace }}/build
env:
CIBW_DEBUG_KEEP_CONTAINER=: TRUE
CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
CIBW_MANYLINUX_I686_IMAGE: manylinux_2_28
CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28
# Skip building PyPy wheels on all platforms
# Skip musllinux builds
CIBW_SKIP: "pp* *-musllinux*"
# Skip i686 builds: 32bit arch not supported in manylinux_2_28
CIBW_SKIP: "pp* *-musllinux* *i686"
CIBW_BUILD_VERBOSITY: 3
CIBW_BEFORE_ALL: >
cd {project} && ./.github/scripts/install_deps.sh {package}
CIBW_BUILD: "cp37-* cp38-* cp39-* cp310-* cp311-*"
CIBW_BUILD: "cp37-* cp38-* cp39-* cp310-* cp311-* cp312-*"
CIBW_ENVIRONMENT: COMPILE_BINDINGS="True"
- uses: actions/upload-artifact@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions CI/windows/install_deps.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,6 @@ function Install-Swig {
Set-Location $DIR_PATH

[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
# Potential alternative but still breaks
# Invoke-WebRequest -UserAgent "Wget" -Uri "https://sourceforge.net/projects/swig/files/swigwin/swigwin-4.0.0/swigwin-4.0.0.zip/download" -OutFile "swigwin-4.0.0.zip"
$crnt_attempt=0
$max_attemps=10
do {
Expand Down
Loading

0 comments on commit 294a7c5

Please sign in to comment.