From 897ea3c22903867b9d41c3d20e273c4370d32fa5 Mon Sep 17 00:00:00 2001 From: Dan Hughes <2237515+dan-hughes@users.noreply.github.com> Date: Fri, 30 May 2025 11:45:32 +0100 Subject: [PATCH 1/6] Update pipeline --- azure-pipelines.yml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7cbd112..eb0df98 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -59,7 +59,7 @@ stages: displayName: 'HQRM' pool: vmImage: 'windows-latest' - timeoutInMinutes: 0 + timeoutInMinutes: '0' steps: - task: DownloadPipelineArtifact@2 displayName: 'Download Build Artifact' @@ -86,7 +86,7 @@ stages: displayName: 'Unit Windows (WPS)' pool: vmImage: 'windows-latest' - timeoutInMinutes: 0 + timeoutInMinutes: '0' steps: - task: DownloadPipelineArtifact@2 displayName: 'Download Build Artifact' @@ -125,13 +125,12 @@ stages: inputs: targetPath: '$(buildFolderName)/$(testResultFolderName)/' artifactName: 'CodeCoverageWindowsWPS' - parallel: true - job: test_windows_ps displayName: 'Unit Windows (PS)' pool: vmImage: 'windows-latest' - timeoutInMinutes: 0 + timeoutInMinutes: '0' steps: - task: DownloadPipelineArtifact@2 displayName: 'Download Build Artifact' @@ -159,13 +158,12 @@ stages: inputs: targetPath: '$(buildFolderName)/$(testResultFolderName)/' artifactName: 'CodeCoverageWindowsPS' - parallel: true - job: test_linux displayName: 'Unit Linux' pool: - vmImage: 'ubuntu-20.04' - timeoutInMinutes: 0 + vmImage: 'ubuntu-latest' + timeoutInMinutes: '0' steps: - task: DownloadPipelineArtifact@2 displayName: 'Download Build Artifact' @@ -203,13 +201,12 @@ stages: inputs: targetPath: '$(buildFolderName)/$(testResultFolderName)/' artifactName: 'CodeCoverageLinux' - parallel: true - job: test_macos displayName: 'Unit macOS' pool: vmImage: 'macos-latest' - timeoutInMinutes: 0 + timeoutInMinutes: '0' steps: - task: DownloadPipelineArtifact@2 displayName: 'Download Build Artifact' @@ -237,13 +234,12 @@ stages: inputs: targetPath: '$(buildFolderName)/$(testResultFolderName)/' artifactName: 'CodeCoverageMacOS' - parallel: true - job: Test_Integration displayName: 'Integration' pool: vmImage: 'windows-latest' - timeoutInMinutes: 0 + timeoutInMinutes: '0' steps: - task: DownloadPipelineArtifact@2 displayName: 'Download Build Artifact' @@ -283,7 +279,7 @@ stages: condition: succeededOrFailed() pool: vmImage: 'ubuntu-latest' - timeoutInMinutes: 0 + timeoutInMinutes: '0' steps: - task: DownloadPipelineArtifact@2 displayName: 'Download Build Artifact' From 00537ade5f8b7a0e6d6150c21a63e9c3a1ac2bf8 Mon Sep 17 00:00:00 2001 From: Dan Hughes <2237515+dan-hughes@users.noreply.github.com> Date: Fri, 30 May 2025 11:49:09 +0100 Subject: [PATCH 2/6] Update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56306b1..340f72e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- `azure-pipelines.yml` + - Fix linting errors. + - Move from ubuntu-20.04 to ubuntu-latest. + ## [0.13.0] - 2025-02-28 ### Removed From 563cc7e02222e42805889f7c149935542c2b3e2d Mon Sep 17 00:00:00 2001 From: Dan Hughes <2237515+dan-hughes@users.noreply.github.com> Date: Fri, 30 May 2025 12:02:37 +0100 Subject: [PATCH 3/6] Remove patch --- CHANGELOG.md | 1 + azure-pipelines.yml | 17 +++-------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 340f72e..ed50926 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `azure-pipelines.yml` - Fix linting errors. - Move from ubuntu-20.04 to ubuntu-latest. + - Remove ModuleBuilder patch. ## [0.13.0] - 2025-02-28 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index eb0df98..015682a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -94,17 +94,6 @@ stages: buildType: 'current' artifactName: $(buildArtifactName) targetPath: '$(Build.SourcesDirectory)/$(buildFolderName)' - # This is a workaround for the issue: https://github.com/PoshCode/ModuleBuilder/pull/136 - - task: PowerShell@2 - name: patch_module - displayName: 'Patch module ModuleBuilder' - inputs: - targetType: 'inline' - script: | - ./build.ps1 -Task noop - Install-PSResource -Name 'Viscalyx.Common' -Repository 'PSGallery' -TrustRepository -Quiet -Confirm:$false - Install-ModulePatch -Uri 'https://raw.githubusercontent.com/viscalyx/Viscalyx.Common/refs/heads/main/patches/ModuleBuilder_3.1.7_patch.json' -Force - pwsh: true - task: PowerShell@2 name: test displayName: 'Run Unit Test' @@ -172,10 +161,10 @@ stages: artifactName: $(buildArtifactName) targetPath: '$(Build.SourcesDirectory)/$(buildFolderName)' - script: | - wget https://github.com/microsoft/omi/releases/download/v1.6.8-1/omi-1.6.8-1.ssl_110.ulinux.x64.deb - wget https://github.com/microsoft/PowerShell-DSC-for-Linux/releases/download/v1.2.1-0/dsc-1.2.1-0.ssl_100.x64.deb + wget https://github.com/microsoft/omi/releases/download/v1.9.1-0/omi-1.9.1-0.ssl_110.ulinux.s.x64.deb + wget https://github.com/microsoft/PowerShell-DSC-for-Linux/releases/download/v1.2.4-0/dsc-1.2.4-0.ssl_110.x64.deb - sudo dpkg -i omi-1.6.8-1.ssl_110.ulinux.x64.deb dsc-1.2.1-0.ssl_100.x64.deb + sudo dpkg -i omi-1.9.1-0.ssl_110.ulinux.s.x64.deb dsc-1.2.4-0.ssl_110.x64.deb # This is a fix to the following DSC for Linux issue: https://github.com/microsoft/PowerShell-DSC-for-Linux/issues/674 sudo mv /etc/opt/omi/conf/dsc/configuration/baseregistration /etc/opt/omi/conf/dsc/configuration/BaseRegistration From 107a9c85b37a40d2990007df96e4fe2c4ac2e5dc Mon Sep 17 00:00:00 2001 From: Dan Hughes <2237515+dan-hughes@users.noreply.github.com> Date: Fri, 30 May 2025 12:21:49 +0100 Subject: [PATCH 4/6] Remove Linux Dsc install --- azure-pipelines.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 015682a..c0c39b0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -160,16 +160,16 @@ stages: buildType: 'current' artifactName: $(buildArtifactName) targetPath: '$(Build.SourcesDirectory)/$(buildFolderName)' - - script: | - wget https://github.com/microsoft/omi/releases/download/v1.9.1-0/omi-1.9.1-0.ssl_110.ulinux.s.x64.deb - wget https://github.com/microsoft/PowerShell-DSC-for-Linux/releases/download/v1.2.4-0/dsc-1.2.4-0.ssl_110.x64.deb + # - script: | + # wget https://github.com/microsoft/omi/releases/download/v1.9.1-0/omi-1.9.1-0.ssl_110.ulinux.s.x64.deb + # wget https://github.com/microsoft/PowerShell-DSC-for-Linux/releases/download/v1.2.4-0/dsc-1.2.4-0.ssl_110.x64.deb - sudo dpkg -i omi-1.9.1-0.ssl_110.ulinux.s.x64.deb dsc-1.2.4-0.ssl_110.x64.deb + # sudo dpkg -i omi-1.9.1-0.ssl_110.ulinux.s.x64.deb dsc-1.2.4-0.ssl_110.x64.deb - # This is a fix to the following DSC for Linux issue: https://github.com/microsoft/PowerShell-DSC-for-Linux/issues/674 - sudo mv /etc/opt/omi/conf/dsc/configuration/baseregistration /etc/opt/omi/conf/dsc/configuration/BaseRegistration - sudo mv /etc/opt/omi/conf/dsc/configuration/BaseRegistration/baseresource.schema.mof /etc/opt/omi/conf/dsc/configuration/BaseRegistration/BaseResource.schema.mof - displayName: 'Install DSC for Linux' + # # This is a fix to the following DSC for Linux issue: https://github.com/microsoft/PowerShell-DSC-for-Linux/issues/674 + # sudo mv /etc/opt/omi/conf/dsc/configuration/baseregistration /etc/opt/omi/conf/dsc/configuration/BaseRegistration + # sudo mv /etc/opt/omi/conf/dsc/configuration/BaseRegistration/baseresource.schema.mof /etc/opt/omi/conf/dsc/configuration/BaseRegistration/BaseResource.schema.mof + # displayName: 'Install DSC for Linux' - task: PowerShell@2 name: test displayName: 'Run Unit Test' From 4f2c08a0170f954a40180fe7d032260df8601d86 Mon Sep 17 00:00:00 2001 From: Dan Hughes <2237515+dan-hughes@users.noreply.github.com> Date: Fri, 30 May 2025 12:28:11 +0100 Subject: [PATCH 5/6] Remove install DSC step on linux --- azure-pipelines.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c0c39b0..c450e67 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -160,16 +160,6 @@ stages: buildType: 'current' artifactName: $(buildArtifactName) targetPath: '$(Build.SourcesDirectory)/$(buildFolderName)' - # - script: | - # wget https://github.com/microsoft/omi/releases/download/v1.9.1-0/omi-1.9.1-0.ssl_110.ulinux.s.x64.deb - # wget https://github.com/microsoft/PowerShell-DSC-for-Linux/releases/download/v1.2.4-0/dsc-1.2.4-0.ssl_110.x64.deb - - # sudo dpkg -i omi-1.9.1-0.ssl_110.ulinux.s.x64.deb dsc-1.2.4-0.ssl_110.x64.deb - - # # This is a fix to the following DSC for Linux issue: https://github.com/microsoft/PowerShell-DSC-for-Linux/issues/674 - # sudo mv /etc/opt/omi/conf/dsc/configuration/baseregistration /etc/opt/omi/conf/dsc/configuration/BaseRegistration - # sudo mv /etc/opt/omi/conf/dsc/configuration/BaseRegistration/baseresource.schema.mof /etc/opt/omi/conf/dsc/configuration/BaseRegistration/BaseResource.schema.mof - # displayName: 'Install DSC for Linux' - task: PowerShell@2 name: test displayName: 'Run Unit Test' From 49690a68fda58d4a582964b26d3440a7fd7a2ae4 Mon Sep 17 00:00:00 2001 From: Dan Hughes <2237515+dan-hughes@users.noreply.github.com> Date: Fri, 30 May 2025 12:28:53 +0100 Subject: [PATCH 6/6] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed50926..81d5af2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fix linting errors. - Move from ubuntu-20.04 to ubuntu-latest. - Remove ModuleBuilder patch. + - Remove install DSC step on Linux. ## [0.13.0] - 2025-02-28