diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-09-20 00:54:47 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-09-20 02:37:27 +0300 |
| commit | 8609328523e0a10e500333e0996e8d7be3a115de (patch) | |
| tree | 0139a2567bb22fe516464309de2ba19a8ded1953 | |
| parent | 2ffc32b1b3a55a83fd6919a01d0017eee42a9453 (diff) | |
| download | plus-8609328523e0a10e500333e0996e8d7be3a115de.tar.gz plus-8609328523e0a10e500333e0996e8d7be3a115de.tar.bz2 plus-8609328523e0a10e500333e0996e8d7be3a115de.tar.xz plus-8609328523e0a10e500333e0996e8d7be3a115de.zip | |
Fix azure windows builds due issue with lf recoded to crlf.
| -rw-r--r-- | azure-pipelines_windows.yml | 12 | ||||
| -rwxr-xr-x | tools/ci/scripts/azure/mxeremovefiles.sh | 15 |
2 files changed, 23 insertions, 4 deletions
diff --git a/azure-pipelines_windows.yml b/azure-pipelines_windows.yml index 26f4a83aa..f8bce2fbb 100644 --- a/azure-pipelines_windows.yml +++ b/azure-pipelines_windows.yml @@ -10,6 +10,8 @@ jobs: ./tools/ci/scripts/azure/mxetest.sh cp ./dlls/* "$(Build.ArtifactStagingDirectory)" cp ./src/*.exe "$(Build.ArtifactStagingDirectory)" + sudo ./tools/ci/scripts/azure/mxeremovefiles.sh + cp -rf . "$(Build.ArtifactStagingDirectory)" ls "$(Build.ArtifactStagingDirectory)" echo done - task: PublishBuildArtifacts@1 @@ -21,14 +23,14 @@ jobs: pool: name: 'Hosted VS2017' steps: + - checkout: none - task: DownloadBuildArtifacts@0 inputs: buildType: 'current' project: 'ManaPlus' artifactName: 'manaplus32' - script: dir "$(Build.ArtifactStagingDirectory)\manaplus32" - - script: copy "$(Build.ArtifactStagingDirectory)\manaplus32\*" . - - script: type data\test\serverlistplus.xml + - script: xcopy /s "$(Build.ArtifactStagingDirectory)\manaplus32\*" . - script: tools\ci\scripts\addextrafiles.cmd - script: dir - script: | @@ -47,6 +49,8 @@ jobs: ./tools/ci/scripts/azure/mxetest.sh cp ./dlls/* "$(Build.ArtifactStagingDirectory)" cp ./src/*.exe "$(Build.ArtifactStagingDirectory)" + sudo ./tools/ci/scripts/azure/mxeremovefiles.sh + cp -rf . "$(Build.ArtifactStagingDirectory)" ls "$(Build.ArtifactStagingDirectory)" echo done - task: PublishBuildArtifacts@1 @@ -58,14 +62,14 @@ jobs: pool: name: 'Hosted VS2017' steps: + - checkout: none - task: DownloadBuildArtifacts@0 inputs: buildType: 'current' project: 'ManaPlus' artifactName: 'manaplus64' - script: dir "$(Build.ArtifactStagingDirectory)\manaplus64" - - script: copy "$(Build.ArtifactStagingDirectory)\manaplus64\*" . - - script: type data\test\serverlistplus.xml + - script: xcopy /s "$(Build.ArtifactStagingDirectory)\manaplus64\*" . - script: tools\ci\scripts\addextrafiles.cmd - script: dir - script: | diff --git a/tools/ci/scripts/azure/mxeremovefiles.sh b/tools/ci/scripts/azure/mxeremovefiles.sh new file mode 100755 index 000000000..455829137 --- /dev/null +++ b/tools/ci/scripts/azure/mxeremovefiles.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +rm -rf .git +rm -rf src +rm -rf build +rm -rf packaging +rm -rf docs +rm -rf po +rm -rf dlls +rm -rf m4 +rm -rf autom4te.cache +rm -rf CMake +rm -rf cppcheck +rm -rf mana +rm -rf nightly |