diff --git a/CI/macOS/install_deps b/CI/macOS/install_deps index 20e08ae3..be7cc2a7 100755 --- a/CI/macOS/install_deps +++ b/CI/macOS/install_deps @@ -2,9 +2,6 @@ set -ex -LIBIIO_VERSION=libiio-v0 -GLOG_VERSION=v0.4.0 - WORKDIR=$(pwd) install_packages() { @@ -74,6 +71,18 @@ build_libiio() { chmod +x macos_tar_fixup.sh ./macos_tar_fixup.sh cd "${WORKDIR}" + + echo "#### Building with documentation" + cd "${WORKDIR}"/libiio/build + cmake "${WORKDIR}"/libiio \ + -Werror=dev \ + -DCOMPILE_WARNING_AS_ERROR=ON \ + -DCPP_BINDINGS=ON \ + -DPYTHON_BINDINGS=ON \ + -DWITH_DOC=ON \ + -DWITH_SERIAL_BACKEND=ON + make + cd "${WORKDIR}" } install_packages diff --git a/CI/ubuntu/install_deps b/CI/ubuntu/install_deps index cd795b43..e52d602c 100755 --- a/CI/ubuntu/install_deps +++ b/CI/ubuntu/install_deps @@ -1,7 +1,6 @@ #!/bin/sh -e TOP_DIR=$(pwd) -LIBIIO_VERSION=libiio-v0 set -x diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8f15cb18..fb74de15 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -8,6 +8,7 @@ variables: REPO_SLUG: $(Build.Repository.Name) CURRENT_COMMIT: $(Build.SourceVersion) LIBIIO_VERSION: 'libiio-v0' + GLOG_VERSION: 'v0.4.0' trigger: - main @@ -31,7 +32,7 @@ parameters: - 3.9 - 3.8 - 3.7 -# TODO: Fix conditions to export artifacts after validating current pipelines + jobs: - job: LinuxBuilds strategy: @@ -75,7 +76,6 @@ jobs: contents: '$(Agent.BuildDirectory)/s/build/?(libm2k*.deb|libm2k*.rpm)' targetFolder: '$(Build.ArtifactStagingDirectory)' - task: PublishPipelineArtifact@1 - # condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), ne(variables['System.JobName'], 'deploy_doxygen')) condition: and(succeeded(), ne(variables['System.JobName'], 'deploy_doxygen')) inputs: targetPath: '$(Build.ArtifactStagingDirectory)' @@ -89,13 +89,15 @@ jobs: macOS_12: poolName: 'Azure Pipelines' vmImage: 'macOS-12' - agentName: 'Azure Pipelines 3' artifactName: 'macOS-12' macOS_13_x64: poolName: 'Azure Pipelines' vmImage: 'macOS-13' - agentName: 'Azure Pipelines 2' artifactName: 'macOS-13-x64' + macOS_14_x64: + poolName: 'Azure Pipelines' + vmImage: 'macOS-14' + artifactName: 'macOS-14-x64' # TODO: discuss with DevOps team how to setup ARM agent # macOS_13_arm64: # poolName: 'Default' @@ -105,8 +107,6 @@ jobs: pool: name: $(poolName) vmImage: $(vmImage) - demands: - - agent.name -equals $(agentName) steps: - checkout: self fetchDepth: 1 @@ -117,7 +117,6 @@ jobs: addToPath: true - script: ./CI/macOS/install_deps displayName: "Install Dependencies" - condition: ne(variables['agentName'],'macOS_arm64') - task: CopyFiles@2 inputs: sourceFolder: '$(Agent.BuildDirectory)/s/libiio/build/' @@ -161,7 +160,6 @@ jobs: contents: '$(Agent.BuildDirectory)/s/build_tar/?(*.tar.gz)' targetFolder: '$(Build.ArtifactStagingDirectory)' - task: PublishPipelineArtifact@1 - # condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) condition: succeeded() inputs: targetPath: '$(Build.ArtifactStagingDirectory)' @@ -236,13 +234,11 @@ jobs: displayName: Wheel Python ${{ pyVersion }} - task: PowerShell@2 displayName: 'Create libm2k-system-setup installer' - # condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.JobName'], 'VS_2022')) condition: and(succeeded(), eq(variables['System.JobName'], 'VS_2022')) inputs: targetType: 'filePath' filePath: ./CI/windows/create_installer.ps1 - task: PublishPipelineArtifact@1 - # condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.JobName'], 'VS_2022')) condition: and(succeeded(), eq(variables['System.JobName'], 'VS_2022')) inputs: targetPath: '$(Build.ArtifactStagingDirectory)/installer' @@ -253,7 +249,6 @@ jobs: targetType: 'filePath' filePath: ./CI/windows/create_zips.ps1 - task: PublishPipelineArtifact@1 - # condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) condition: succeeded() inputs: targetPath: '$(Build.ArtifactStagingDirectory)/libm2k-$(PLATFORM)'