Skip to content

Commit c033a5e

Browse files
Fix compile-time expansions in base templates. (#10258)
Co-authored-by: Travis Prescott <trpresco@microsoft.com>
1 parent d96cea6 commit c033a5e

2 files changed

Lines changed: 37 additions & 17 deletions

File tree

eng/common/pipelines/templates/jobs/apireview-hub-job-base.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,17 @@ jobs:
5656
- bash: |
5757
set -Eeuo pipefail
5858
59-
source_repo="${{ parameters.sourceCheckoutDir }}"
60-
repository_full_name="${{ parameters.sourceRepositoryFullName }}"
59+
source_repo="$SOURCE_CHECKOUT_DIR"
60+
repository_full_name="$SOURCE_REPOSITORY_FULL_NAME"
6161
6262
rm -rf "$source_repo"
6363
mkdir -p "$(dirname "$source_repo")"
6464
6565
echo "Cloning $repository_full_name into $source_repo"
6666
git clone --filter=blob:none --no-checkout "https://github.com/$repository_full_name.git" "$source_repo"
67+
env:
68+
SOURCE_CHECKOUT_DIR: ${{ parameters.sourceCheckoutDir }}
69+
SOURCE_REPOSITORY_FULL_NAME: ${{ parameters.sourceRepositoryFullName }}
6770
displayName: 'Clone API review source repository'
6871
6972
- ${{ parameters.setupSteps }}

eng/common/pipelines/templates/steps/create-apireview-hub-artifacts-base.yml

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,19 @@ steps:
2929
- pwsh: |
3030
$ErrorActionPreference = 'Stop'
3131
32-
New-Item -ItemType Directory -Force -Path '${{ parameters.outputDir }}' | Out-Null
33-
New-Item -ItemType Directory -Force -Path '${{ parameters.workingDir }}' | Out-Null
34-
New-Item -ItemType Directory -Force -Path '${{ parameters.workingDir }}/state' | Out-Null
32+
New-Item -ItemType Directory -Force -Path $env:OUTPUT_DIR | Out-Null
33+
New-Item -ItemType Directory -Force -Path $env:WORKING_DIR | Out-Null
34+
New-Item -ItemType Directory -Force -Path (Join-Path $env:WORKING_DIR 'state') | Out-Null
35+
env:
36+
OUTPUT_DIR: ${{ parameters.outputDir }}
37+
WORKING_DIR: ${{ parameters.workingDir }}
3538
displayName: 'Prepare ${{ parameters.kind }} API review bundle directories'
3639
3740
- bash: |
3841
set -Eeuo pipefail
3942
40-
source_repo="${{ parameters.sourceDir }}"
41-
ref="${{ parameters.ref }}"
43+
source_repo="$SOURCE_DIR"
44+
ref="$REF"
4245
4346
if [ ! -d "$source_repo/.git" ]; then
4447
echo "Expected API review source repository was not cloned at $source_repo" >&2
@@ -52,19 +55,23 @@ steps:
5255
exit 1
5356
fi
5457
55-
echo "Checking out ${{ parameters.kind }} API review source ref $ref in $source_repo"
58+
echo "Checking out $KIND API review source ref $ref in $source_repo"
5659
git -C "$source_repo" fetch --depth=1 origin "$ref"
5760
git -C "$source_repo" checkout --force FETCH_HEAD
5861
git -C "$source_repo" clean -ffd
62+
env:
63+
SOURCE_DIR: ${{ parameters.sourceDir }}
64+
REF: ${{ parameters.ref }}
65+
KIND: ${{ parameters.kind }}
5966
displayName: 'Checkout ${{ parameters.kind }} API review source'
6067
6168
- ${{ parameters.generationSteps }}
6269

6370
- pwsh: |
6471
$ErrorActionPreference = 'Stop'
6572
66-
$outputDir = '${{ parameters.outputDir }}'
67-
$stateDir = '${{ parameters.workingDir }}/state'
73+
$outputDir = $env:OUTPUT_DIR
74+
$stateDir = Join-Path $env:WORKING_DIR 'state'
6875
$apiMdPath = Join-Path $outputDir 'api.md'
6976
$apiMetadataPath = Join-Path $outputDir 'api.metadata.yml'
7077
$packageRelativePathPath = Join-Path $stateDir 'package-relative-path.txt'
@@ -86,16 +93,26 @@ steps:
8693
$version = Get-Content -Raw -Path $versionPath
8794
8895
$metadata = [ordered]@{
89-
operationId = '${{ parameters.operationId }}'
90-
mode = '${{ parameters.requestMode }}'
91-
language = '${{ parameters.language }}'
92-
repositoryFullName = '${{ parameters.repositoryFullName }}'
93-
packageName = '${{ parameters.packageName }}'
96+
operationId = $env:OPERATION_ID
97+
mode = $env:REQUEST_MODE
98+
language = $env:LANGUAGE
99+
repositoryFullName = $env:REPOSITORY_FULL_NAME
100+
packageName = $env:PACKAGE_NAME
94101
packageRelativePath = $packageRelativePath.Trim()
95-
ref = '${{ parameters.ref }}'
102+
ref = $env:REF
96103
version = $version.Trim()
97-
kind = '${{ parameters.kind }}'
104+
kind = $env:KIND
98105
}
99106
$metadata | ConvertTo-Json -Depth 10 | Set-Content -Path (Join-Path $outputDir 'artifact-metadata.json') -Encoding utf8
100107
Get-Content -Path (Join-Path $outputDir 'artifact-metadata.json')
108+
env:
109+
OUTPUT_DIR: ${{ parameters.outputDir }}
110+
WORKING_DIR: ${{ parameters.workingDir }}
111+
OPERATION_ID: ${{ parameters.operationId }}
112+
REQUEST_MODE: ${{ parameters.requestMode }}
113+
LANGUAGE: ${{ parameters.language }}
114+
REPOSITORY_FULL_NAME: ${{ parameters.repositoryFullName }}
115+
PACKAGE_NAME: ${{ parameters.packageName }}
116+
REF: ${{ parameters.ref }}
117+
KIND: ${{ parameters.kind }}
101118
displayName: 'Validate and write ${{ parameters.kind }} API review bundle metadata'

0 commit comments

Comments
 (0)