Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: PowerShell/DSC
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 19c940ea02478db0fa82903b38843d74dcb5484f
Choose a base ref
..
head repository: PowerShell/DSC
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b8002da2fefcc8e1ac1594a8d594ec20eb910967
Choose a head ref
Showing with 30 additions and 8 deletions.
  1. +14 −3 .pipelines/DSC-Official.yml
  2. +15 −4 build.ps1
  3. +1 −1 dsc/Cargo.lock
17 changes: 14 additions & 3 deletions .pipelines/DSC-Official.yml
Original file line number Diff line number Diff line change
@@ -7,6 +7,14 @@ pr:
- onebranch
- release*

schedules:
- cron: '0 3 * * 1'
displayName: Weekly Build
branches:
include:
- main
always: true

variables:
BuildConfiguration: 'release'
PackageRoot: '$(System.ArtifactsDirectory)/Packages'
@@ -25,9 +33,12 @@ extends:
template: v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates
parameters:
featureFlags:
WindowsHostVersion:
WindowsHostVersion:
Disk: Large
Version: 2022
Version: 2022
Network: KS3 # this retricts network access to public upstream repositories
# Currently can't be used as some NPM pkgs like tree-sitter-cli reach out to GitHub to get the actual zip pkg
# Network: NetLock
customTags: 'ES365AIMigrationTooling'
globalSdl:
disableLegacyManifest: true
@@ -48,7 +59,7 @@ extends:
apiscan:
enabled: false

stages:
stages:
- stage: BuildAndSign
displayName: Build Native Binaries
dependsOn: []
19 changes: 15 additions & 4 deletions build.ps1
Original file line number Diff line number Diff line change
@@ -352,18 +352,29 @@ if (!$Clippy -and !$SkipBuild) {
if ($Test) {
$failed = $false

$usingADO = ($null -ne $env:TF_BUILD)
$repository = 'PSGallery'

if ($usingADO) {
$repository = 'CFS'
if ($null -eq (Get-PSResourceRepository -Name CFS -ErrorAction Ignore)) {
"Registering CFS repository"
Register-PSResourceRepository -uri 'https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/nuget/v2' -Name CFS -Trusted
}
}

if ($IsWindows) {
# PSDesiredStateConfiguration module is needed for Microsoft.Windows/WindowsPowerShell adapter
$FullyQualifiedName = @{ModuleName="PSDesiredStateConfiguration";ModuleVersion="2.0.7"}
if (-not(Get-Module -ListAvailable -FullyQualifiedName $FullyQualifiedName))
{ "Installing module PSDesiredStateConfiguration 2.0.7"
Install-PSResource -Name PSDesiredStateConfiguration -Version 2.0.7 -Repository PSGallery -TrustRepository
{
Install-PSResource -Name PSDesiredStateConfiguration -Version 2.0.7 -Repository $repository -TrustRepository
}
}

if (-not(Get-Module -ListAvailable -Name Pester))
{ "Installing module Pester"
Install-PSResource Pester -WarningAction Ignore -Repository PSGallery -TrustRepository
Install-PSResource Pester -WarningAction Ignore -Repository $repository -TrustRepository
}

foreach ($project in $projects) {
@@ -408,7 +419,7 @@ if ($Test) {
if (-not(Get-Module -ListAvailable -Name Pester))
{ "Installing module Pester"
$InstallTargetDir = ($env:PSModulePath -split ";")[0]
Find-PSResource -Name 'Pester' -Repository 'PSGallery' | Save-PSResource -Path $InstallTargetDir -TrustRepository
Find-PSResource -Name 'Pester' -Repository $repository | Save-PSResource -Path $InstallTargetDir -TrustRepository
}

"Updated Pester module location:"
2 changes: 1 addition & 1 deletion dsc/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.