diff --git a/azure-pipelines-windows-template.yml b/azure-pipelines-windows-template.yml index 62c25660..74b6d744 100644 --- a/azure-pipelines-windows-template.yml +++ b/azure-pipelines-windows-template.yml @@ -10,14 +10,15 @@ parameters: jobs: - job: ${{ parameters.name }} + dependsOn: Initialization pool: vmImage: 'vs2017-win2016' steps: - - template: azure-pipelines-build-number.yml - script: | pip install aqtinstall mkdir C:\Qt python -m aqt install -O c:\Qt ${{ parameters.qt_version }} windows desktop ${{ parameters.qt_aqt_spec }} + dir C:\Qt\Qt${{ parameters.qt_version }}\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin choco install -y wget choco install innosetup wget "https://sourceforge.net/projects/sevenzip/files/7-Zip/18.05/7z1805-src.7z" -P $(Build.SourcesDirectory)\compressed_archive @@ -26,13 +27,13 @@ jobs: displayName: 'Install dependencies' - script: | call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\${{ parameters.vc_vars }}" - set PATH=%PATH%;C:\Qt\Qt${{ parameters.qt_version }}\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin + set PATH=C:\Qt\Qt${{ parameters.qt_version }}\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH% set DEFINES_VAR=DEFINES+="BUILD_NUMBER=\\\\\\\"$(Build.BuildNumber)\\\\\\\"" qmake CONFIG+="7zip" %DEFINES_VAR% nmake displayName: 'Build' - script: | - set PATH=%PATH%;C:\Qt\Qt${{ parameters.qt_version }}\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin + set PATH=%PATH%;C:\Qt\Qt${{ parameters.qt_version }}\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH% cd $(Build.SourcesDirectory)\ci\win .\create_installer.cmd ${{ parameters.arquitecture }} 7z $(Build.BuildNumber) displayName: 'Create installer' diff --git a/azure-pipelines.yml b/azure-pipelines.yml index dccab02a..b353851b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,11 +5,16 @@ trigger: - develop jobs: +- job: Initialization + pool: + vmImage: 'vs2017-win2016' + steps: + - template: azure-pipelines-build-number.yml - job: Linux + dependsOn: Initialization pool: vmImage: 'ubuntu-16.04' steps: - - template: azure-pipelines-build-number.yml - script: | sudo add-apt-repository 'deb http://download.opensuse.org/repositories/home:/selmf/xUbuntu_16.04/ /' sudo add-apt-repository ppa:kubuntu-ppa/backports @@ -40,12 +45,12 @@ jobs: path: $(Build.ArtifactStagingDirectory) artifactName: src $(Build.BuildNumber) tarball - job: MacOS + dependsOn: Initialization variables: - group: macos-codesign pool: vmImage: 'macOS-10.14' steps: - - template: azure-pipelines-build-number.yml - script: | brew install qt brew link qt --force @@ -99,4 +104,33 @@ jobs: qt_aqt_spec: 'win32_msvc2017' vc_redist_url: 'https://go.microsoft.com/fwlink/?LinkId=746571' vc_redist_file_name: 'vc_redist.x86.exe' - vc_vars: 'vcvars32.bat' \ No newline at end of file + vc_vars: 'vcvars32.bat' +- job: PublishDevBuilds + dependsOn: + - Linux + - MacOS + - Windows_x86 + - Windows_x64 + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'develop')) + variables: + - group: bintray + pool: + vmImage: 'ubuntu-16.04' + steps: + - task: DownloadPipelineArtifact@2 + inputs: + buildType: 'current' + targetPath: $(Build.SourcesDirectory)/dev_bin + - script: | + ls -lah $(Build.SourcesDirectory)/dev_bin/**/*.* + - task: cURLUploader@2 + inputs: + files: '$(Build.SourcesDirectory)/dev_bin/**/*.*' + authType: 'userAndPass' + username: $(username) + password: $(api-key) + options: -H "X-Bintray-Publish:1" + remotePath: '' + url: https://api.bintray.com/content/luisangelsm/YACReader/DevBuilds/$(Build.BuildNumber)/ + + \ No newline at end of file