Skip to content

Commit 18c664b

Browse files
committed
Merge the microbuild branch from https://github.com/aarnott/Library.Template
Specifically, this merges [bd12df8 from that repo](AArnott/Library.Template@bd12df8).
2 parents a8e7acf + bd12df8 commit 18c664b

5 files changed

Lines changed: 10 additions & 8 deletions

File tree

azure-pipelines/prepare-insertion-stages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ stages:
5151
pool:
5252
name: AzurePipelines-EO
5353
demands:
54-
- ImageOverride -equals 1ESPT-Ubuntu22.04 # Do NOT upgrade to Ubuntu24 until this is fixed: https://portal.microsofticm.com/imp/v5/incidents/details/830879871/summary
54+
- ImageOverride -equals 1ESPT-Ubuntu22.04 # Do NOT upgrade this job to Ubuntu24 until this is fixed: https://portal.microsofticm.com/imp/v5/incidents/details/830879871/summary
5555
os: Linux
5656
templateContext:
5757
outputs:

azure-pipelines/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extends:
3333
pool:
3434
name: AzurePipelines-EO
3535
demands:
36-
- ImageOverride -equals 1ESPT-Ubuntu22.04 # Do NOT upgrade to Ubuntu24 until this is fixed: https://portal.microsofticm.com/imp/v5/incidents/details/830879871/summary
36+
- ImageOverride -equals 1ESPT-Ubuntu22.04 # Do NOT upgrade this job to Ubuntu24 until this is fixed: https://portal.microsofticm.com/imp/v5/incidents/details/830879871/summary
3737
os: Linux
3838
templateContext:
3939
outputs:

tools/GitHubActions.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ function Add-GitHubActionsEnvVariable {
99
)
1010

1111
if ([string]::IsNullOrWhiteSpace($Path)) {
12-
throw "GitHub Actions environment file must not be empty."
12+
throw "GitHub Actions environment file path must not be empty."
1313
}
1414

1515
if ([string]::IsNullOrWhiteSpace($Name)) {
16-
throw "GitHub Actions environment variable names must not be empty."
16+
throw "GitHub Actions environment variable name must not be empty."
1717
}
1818

1919
$utf8NoBom = [System.Text.UTF8Encoding]::new($false)
@@ -29,11 +29,11 @@ function Add-GitHubActionsPath {
2929
)
3030

3131
if ([string]::IsNullOrWhiteSpace($Path)) {
32-
throw "GitHub Actions path file must not be empty."
32+
throw "GitHub Actions path file path must not be empty."
3333
}
3434

3535
if ([string]::IsNullOrWhiteSpace($Value)) {
36-
throw "GitHub Actions path entries must not be empty."
36+
throw "GitHub Actions path entry must not be empty."
3737
}
3838

3939
$utf8NoBom = [System.Text.UTF8Encoding]::new($false)

tools/Set-EnvVars.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ Param(
1919
[string[]]$PrependPath
2020
)
2121

22-
. "$PSScriptRoot\GitHubActions.ps1"
22+
if ($env:GITHUB_ACTIONS) {
23+
. "$PSScriptRoot\GitHubActions.ps1"
24+
}
2325

2426
if ($Variables.Count -eq 0) {
2527
return $true

tools/variables/_define.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<#
22
.SYNOPSIS
33
This script translates the variables returned by the _all.ps1 script
4-
into commands that instruct Azure Pipelines to actually set those variables for other pipeline tasks to consume.
4+
into commands that instruct Azure Pipelines or GitHub Actions to actually set those variables for other pipeline tasks to consume.
55
66
The build or release definition may have set these variables to override
77
what the build would do. So only set them if they have not already been set.

0 commit comments

Comments
 (0)