Merge commit '12a36dc542a40956bc31b607f3f01b624f3c214f'

This commit is contained in:
Mirroring 2024-07-16 22:21:42 +00:00
commit 98f5daaa99

View file

@ -57,6 +57,11 @@ parameters:
type: boolean type: boolean
default: false default: false
# Freeform field for extra values to pass to build.sh for special build modes
- name: extraProperties
type: string
default: ''
jobs: jobs:
- job: ${{ parameters.buildName }}_${{ parameters.architecture }} - job: ${{ parameters.buildName }}_${{ parameters.architecture }}
timeoutInMinutes: 150 timeoutInMinutes: 150
@ -230,7 +235,12 @@ jobs:
customBuildArgs="$customBuildArgs --use-mono-runtime" customBuildArgs="$customBuildArgs --use-mono-runtime"
fi fi
docker run --rm -v "$(sourcesPath):/vmr" -w /vmr $customRunArgs ${{ parameters.container }} ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs extraProperties="${{ parameters.extraProperties }}"
if [[ -n "$extraProperties" ]]; then
extraProperties="-- $extraProperties"
fi
docker run --rm -v "$(sourcesPath):/vmr" -w /vmr $customRunArgs ${{ parameters.container }} ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraProperties
displayName: Build displayName: Build
- script: | - script: |
@ -244,7 +254,7 @@ jobs:
poisonArg='--poison' poisonArg='--poison'
fi fi
docker run --rm $dockerVolumeArgs -w /vmr $dockerEnvArgs ${{ parameters.container }} ./build.sh $poisonArg --run-smoke-test $(additionalBuildArgs) -- -p:SmokeTestConsoleVerbosity=detailed docker run --rm $dockerVolumeArgs -w /vmr $dockerEnvArgs ${{ parameters.container }} ./build.sh $poisonArg --run-smoke-test $(additionalBuildArgs) -- -p:SmokeTestConsoleVerbosity=detailed ${{ parameters.extraProperties }}
displayName: Run Tests displayName: Run Tests
# Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph. # Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph.