diff options
| author | Andrei Karas <akaras@inbox.ru> | 2020-05-30 07:56:42 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2020-05-30 09:46:22 +0300 |
| commit | 3999aa8db3ccc5486af4808b9a6c693ffef13224 (patch) | |
| tree | 6a35f1ed1e9c413d0d4813bca3fc47f7685112f7 | |
| parent | 8868e9dfe194d047b30c295acba49d721c1862a6 (diff) | |
| download | plus-3999aa8db3ccc5486af4808b9a6c693ffef13224.tar.gz plus-3999aa8db3ccc5486af4808b9a6c693ffef13224.tar.bz2 plus-3999aa8db3ccc5486af4808b9a6c693ffef13224.tar.xz plus-3999aa8db3ccc5486af4808b9a6c693ffef13224.zip | |
Fiz azure login to docker registry
| -rw-r--r-- | azure-pipelines_windows.yml | 4 | ||||
| -rwxr-xr-x | tools/ci/scripts/azure/mxetest.sh | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/azure-pipelines_windows.yml b/azure-pipelines_windows.yml index 31279c309..0538d8a8b 100644 --- a/azure-pipelines_windows.yml +++ b/azure-pipelines_windows.yml @@ -14,11 +14,11 @@ jobs: cp -rf . "$(Build.ArtifactStagingDirectory)" ls "$(Build.ArtifactStagingDirectory)" echo done + env: + GITLABTOKEN: $(gitlabtoken) - task: PublishBuildArtifacts@1 inputs: artifactName: manaplus32 - env: - GITLABTOKEN: $(gitlabtoken) - job: mxe_32_test dependsOn: mxe_32_build diff --git a/tools/ci/scripts/azure/mxetest.sh b/tools/ci/scripts/azure/mxetest.sh index 216e24b7a..d92085173 100755 --- a/tools/ci/scripts/azure/mxetest.sh +++ b/tools/ci/scripts/azure/mxetest.sh @@ -1,7 +1,9 @@ #!/bin/bash -echo docker login registry.gitlab.com -docker login registry.gitlab.com -u azure -p $GITLABTOKEN +echo docker login --help +docker login --help +echo docker login registry.gitlab.com -u azure -p TOKEN +docker login registry.gitlab.com -u azure -p $GITLABTOKEN || exit 1 export IMAGE="registry.gitlab.com/manaplus/mxe:gcc6_shared_${BITS}" export COMMAND="./tools/ci/jobs/mxe_gcc6_tests.sh --without-manaplusgame --without-dyecmd" |