From 3b3752c84f6c93e2e46f1ba1128c64a30364b599 Mon Sep 17 00:00:00 2001 From: Adrian Stanea Date: Wed, 16 Oct 2024 15:48:59 +0300 Subject: [PATCH 1/4] ci/macOS: add new macOS 14 image Signed-off-by: Adrian Stanea --- azure-pipelines.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8f15cb18..e1b3229c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -96,6 +96,11 @@ jobs: vmImage: 'macOS-13' agentName: 'Azure Pipelines 2' artifactName: 'macOS-13-x64' + macOS_14_x64: + poolName: 'Azure Pipelines' + vmImage: 'macOS-14' + agentName: 'Azure Pipelines 2' + artifactName: 'macOS-14-x64' # TODO: discuss with DevOps team how to setup ARM agent # macOS_13_arm64: # poolName: 'Default' From c1c69f9359369109212a959d24a9460da21f7f2b Mon Sep 17 00:00:00 2001 From: Adrian Stanea Date: Thu, 17 Oct 2024 15:27:34 +0300 Subject: [PATCH 2/4] ci: remove unused checks Signed-off-by: Adrian Stanea --- azure-pipelines.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e1b3229c..a766da12 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -31,7 +31,7 @@ parameters: - 3.9 - 3.8 - 3.7 -# TODO: Fix conditions to export artifacts after validating current pipelines + jobs: - job: LinuxBuilds strategy: @@ -75,7 +75,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,17 +88,14 @@ 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' - agentName: 'Azure Pipelines 2' artifactName: 'macOS-14-x64' # TODO: discuss with DevOps team how to setup ARM agent # macOS_13_arm64: @@ -110,8 +106,6 @@ jobs: pool: name: $(poolName) vmImage: $(vmImage) - demands: - - agent.name -equals $(agentName) steps: - checkout: self fetchDepth: 1 @@ -122,7 +116,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/' @@ -166,7 +159,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)' @@ -241,13 +233,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' @@ -258,7 +248,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)' From 2f8023ca0546fdc685c91bdf8a10a8e8db4f28b0 Mon Sep 17 00:00:00 2001 From: Adrian Stanea Date: Wed, 23 Oct 2024 13:52:40 +0300 Subject: [PATCH 3/4] ci/macOS: build libiio docs Signed-off-by: Adrian Stanea --- CI/macOS/install_deps | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CI/macOS/install_deps b/CI/macOS/install_deps index 20e08ae3..0f1f1e1a 100755 --- a/CI/macOS/install_deps +++ b/CI/macOS/install_deps @@ -74,6 +74,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 From 2f41c3f696199f44c0305e4ccb2f15ce7b077377 Mon Sep 17 00:00:00 2001 From: Adrian Stanea Date: Wed, 23 Oct 2024 14:02:02 +0300 Subject: [PATCH 4/4] ci: remove package version overwrites - The versions are defined in azure-pipelines.yml and the CI scripts should all build using the specified version. Signed-off-by: Adrian Stanea --- CI/macOS/install_deps | 3 --- CI/ubuntu/install_deps | 1 - azure-pipelines.yml | 1 + 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/CI/macOS/install_deps b/CI/macOS/install_deps index 0f1f1e1a..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() { 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 a766da12..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