Merge 8b55afbc7c into 61fd9aa167
commit
ba00deb998
|
|
@ -352,6 +352,7 @@ class ImageEnvironmentFactory {
|
||||||
{ name: 'SCOPED_REGISTRY_URL', value: parameters.scopedRegistryUrl },
|
{ name: 'SCOPED_REGISTRY_URL', value: parameters.scopedRegistryUrl },
|
||||||
{ name: 'REGISTRY_SCOPES', value: parameters.registryScopes },
|
{ name: 'REGISTRY_SCOPES', value: parameters.registryScopes },
|
||||||
{ name: 'PRIVATE_REGISTRY_TOKEN', value: process.env.UPM_REGISTRY_TOKEN },
|
{ name: 'PRIVATE_REGISTRY_TOKEN', value: process.env.UPM_REGISTRY_TOKEN },
|
||||||
|
{ name: 'PRIVATE_REGISTRY_USER', value: process.env.UPM_REGISTRY_USER },
|
||||||
{ name: 'GIT_PRIVATE_TOKEN', value: parameters.gitPrivateToken },
|
{ name: 'GIT_PRIVATE_TOKEN', value: parameters.gitPrivateToken },
|
||||||
{ name: 'VERSION', value: parameters.buildVersion },
|
{ name: 'VERSION', value: parameters.buildVersion },
|
||||||
{ name: 'CUSTOM_PARAMETERS', value: parameters.customParameters },
|
{ name: 'CUSTOM_PARAMETERS', value: parameters.customParameters },
|
||||||
|
|
@ -1016,7 +1017,7 @@ const ResultsCheck = {
|
||||||
core.info(`Processing file ${filepath}...`);
|
core.info(`Processing file ${filepath}...`);
|
||||||
try {
|
try {
|
||||||
const content = fs.readFileSync(path_1.default.join(artifactsPath, filepath), 'utf8');
|
const content = fs.readFileSync(path_1.default.join(artifactsPath, filepath), 'utf8');
|
||||||
if (!content.includes('<test-results') && !content.includes('<test-run')) {
|
if (!content.includes('<test-run')) {
|
||||||
// noinspection ExceptionCaughtLocallyJS
|
// noinspection ExceptionCaughtLocallyJS
|
||||||
throw new Error('File does not appear to be a NUnit XML file');
|
throw new Error('File does not appear to be a NUnit XML file');
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -53,6 +53,13 @@ if [ -n "$PRIVATE_REGISTRY_TOKEN" ]; then
|
||||||
token = "$PRIVATE_REGISTRY_TOKEN"
|
token = "$PRIVATE_REGISTRY_TOKEN"
|
||||||
alwaysAuth = true
|
alwaysAuth = true
|
||||||
EOF
|
EOF
|
||||||
|
# Some npm repositories (Azure Devops) require a user to be configred
|
||||||
|
# even if it isn't a valid one.
|
||||||
|
if [ -n "$PRIVATE_REGISTRY_USER" ]; then
|
||||||
|
cat >> "$UPM_CONFIG_TOML_PATH" <<EOF
|
||||||
|
user = "$PRIVATE_REGISTRY_USER"
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,7 @@ class ImageEnvironmentFactory {
|
||||||
{ name: 'SCOPED_REGISTRY_URL', value: parameters.scopedRegistryUrl },
|
{ name: 'SCOPED_REGISTRY_URL', value: parameters.scopedRegistryUrl },
|
||||||
{ name: 'REGISTRY_SCOPES', value: parameters.registryScopes },
|
{ name: 'REGISTRY_SCOPES', value: parameters.registryScopes },
|
||||||
{ name: 'PRIVATE_REGISTRY_TOKEN', value: process.env.UPM_REGISTRY_TOKEN },
|
{ name: 'PRIVATE_REGISTRY_TOKEN', value: process.env.UPM_REGISTRY_TOKEN },
|
||||||
|
{ name: 'PRIVATE_REGISTRY_USER', value: process.env.UPM_REGISTRY_USER },
|
||||||
{ name: 'GIT_PRIVATE_TOKEN', value: parameters.gitPrivateToken },
|
{ name: 'GIT_PRIVATE_TOKEN', value: parameters.gitPrivateToken },
|
||||||
{ name: 'VERSION', value: parameters.buildVersion },
|
{ name: 'VERSION', value: parameters.buildVersion },
|
||||||
{ name: 'CUSTOM_PARAMETERS', value: parameters.customParameters },
|
{ name: 'CUSTOM_PARAMETERS', value: parameters.customParameters },
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue