diff --git a/.github/scripts/install_deps.sh b/.github/scripts/install_deps.sh index c030e62a..128eb801 100755 --- a/.github/scripts/install_deps.sh +++ b/.github/scripts/install_deps.sh @@ -4,9 +4,15 @@ LIBIIO_VERSION=libiio-v0 PACKAGE_DIR=${1-build} echo $PACKAGE_DIR -apt-get -qq update -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 +# apt-get -qq update +# 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 +echo "Calling update - SKIPPED" +yum -y update +echo "Installing dependencies" +# 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 install -y git wget tar graphviz avahi-devel libaio-devel libusb1-devel libxml2-devel rpm rpm-build tar bzip2 gzip flex b#ison git swig python3 python3-devel python3-setuptools python3-pip cmake +echo "Installing cmake with pip" python3 -m pip install cmake cmake --version diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 413b077e..660b1d79 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -9,11 +9,12 @@ jobs: strategy: matrix: os: [ubuntu-22.04] + # os: [CentOS_7] # manylinux2014: (CentOS 7 based) python_version: ['3.11'] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v4 name: Install Python ${{ matrix.python_version }} with: python-version: ${{ matrix.python_version }} @@ -22,23 +23,25 @@ jobs: run: | mkdir ${{ github.workspace }}/build touch ${{ github.workspace }}/build/setup.py + # TODO: Test using more recent Docker image - name: Get some sample wheels run: | python -m pip install cibuildwheel twine cibuildwheel --output-dir ${{ github.workspace }}/wheelhouse ${{ github.workspace }}/build env: - CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_24 - CIBW_MANYLINUX_I686_IMAGE: manylinux_2_24 - CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_24 + CIBW_DEBUG_KEEP_CONTAINER=: TRUE + CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 + CIBW_MANYLINUX_I686_IMAGE: manylinux2014 + CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014 # Skip building PyPy wheels on all platforms # Skip musllinux builds CIBW_SKIP: "pp* *-musllinux*" - CIBW_BUILD_VERBOSITY: 1 + CIBW_BUILD_VERBOSITY: 3 CIBW_BEFORE_ALL: > cd {project} && ./.github/scripts/install_deps.sh {package} CIBW_BUILD: "cp37-* cp38-* cp39-* cp310-* cp311-*" CIBW_ENVIRONMENT: COMPILE_BINDINGS="True" - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: manylinux_wheels path: ${{ github.workspace }}/wheelhouse diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3ced5c08..7b29dcc4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -68,29 +68,6 @@ jobs: targetFolder: '$(Build.ArtifactStagingDirectory)' - script: ./CI/ubuntu/make_linux displayName: "Build" - - ${{ each pyVersion in parameters.pythonVersions }}: - - task: UsePythonVersion@0 - condition: and(ne(variables['System.JobName'], 'deploy_doxygen'), eq('${{ pyVersion }}', '3.11')) - displayName: Use Python ${{ pyVersion }} - inputs: - versionSpec: '${{ pyVersion }}' - - script: | - python3 --version - python3 -m pip install wheel twine build virtualenv - cd '$(Agent.BuildDirectory)/s/build/' - mkdir -p wheelhouse - export COMPILE_BINDINGS=True - python3 -m build - export COMPILE_BINDINGS= - cp dist/*.whl wheelhouse - displayName: Wheel Python ${{ pyVersion }} - condition: and(ne(variables['System.JobName'], 'deploy_doxygen'), eq('${{ pyVersion }}', '3.11')) - - task: CopyFiles@2 - condition: ne(variables['System.JobName'], 'deploy_doxygen') - inputs: - sourceFolder: '$(Agent.BuildDirectory)/s/build/' - contents: '$(Agent.BuildDirectory)/s/build/wheelhouse/?(*.whl)' - targetFolder: '$(Build.ArtifactStagingDirectory)' - task: CopyFiles@2 condition: ne(variables['System.JobName'], 'deploy_doxygen') inputs: