From 25152af11aeb3be8f07c9c19f4fa84997fa3ffec Mon Sep 17 00:00:00 2001 From: Anatoly Popov Date: Fri, 28 Sep 2018 14:59:50 +0300 Subject: [PATCH] Repro for Microsoft team --- .azure/test.yml | 19 ------------------ .azure/tests.yml | 48 --------------------------------------------- azure-pipelines.yml | 36 +++------------------------------- 3 files changed, 3 insertions(+), 100 deletions(-) delete mode 100644 .azure/test.yml delete mode 100644 .azure/tests.yml diff --git a/.azure/test.yml b/.azure/test.yml deleted file mode 100644 index 3c527e3c..00000000 --- a/.azure/test.yml +++ /dev/null @@ -1,19 +0,0 @@ -parameters: - path: '' - framework: '' - frameworkGlobal: true - -steps: -- ${{ if eq(parameters.frameworkGlobal, 'false') }}: - - script: ${{ format('/home/vsts/.dotnet/dotnet test -f {0} --no-build --logger trx -c Release {1}', parameters.framework, parameters.path) }} - displayName: ${{ format('dotnet test -f {0}', parameters.framework) }} - -- ${{ if eq(parameters.frameworkGlobal, 'true') }}: - - task: DotNetCoreCLI@2 - displayName: ${{ format('dotnet test -f {0}', parameters.framework) }} - inputs: - command: test - nobuild: true - projects: ${{ parameters.path }} - arguments: ${{ format(' -f {0} -c Release', parameters.framework) }} - publishTestResults: true diff --git a/.azure/tests.yml b/.azure/tests.yml deleted file mode 100644 index 41508c17..00000000 --- a/.azure/tests.yml +++ /dev/null @@ -1,48 +0,0 @@ -parameters: - netcore1Global: true - -steps: -- task: DotNetCoreCLI@2 - displayName: dotnet build - inputs: - command: build - projects: progaudi.tarantool.sln - arguments: -c Release - verbosityRestore: minimal - -- task: Bash@3 - displayName: set version variable - inputs: - targetType: inline - script: echo "##vso[task.setvariable variable=NugetPackageVersion]$(git describe --tags | sed 's/-/./')" - -- task: DotNetCoreCLI@2 - displayName: pack nuget package - inputs: - command: pack - versioningScheme: byEnvVar - versionEnvVar: NugetPackageVersion - arguments: --no-build -c Release /property:PackageOutputPath=$(Build.ArtifactStagingDirectory) - verbosityPack: minimal - -- task: Bash@3 - inputs: - targetType: inline - script: docker-compose up -d - -- template: test.yml - parameters: - path: tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj - framework: netcoreapp1.0 - frameworkGlobal: ${{ parameters.netcore1Global }} - -- template: test.yml - parameters: - path: tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj - framework: netcoreapp1.1 - frameworkGlobal: ${{ parameters.netcore1Global }} - -- template: test.yml - parameters: - path: tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj - framework: netcoreapp2.0 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d7553568..3d91f5a9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,39 +1,9 @@ jobs: -- job: macOs - pool: - name: Hosted macOS - steps: - - template: .azure/tests.yml - -- job: linux - pool: - name: Hosted Ubuntu 1604 - steps: - - script: curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin -channel 1.1 - displayName: Installing .netcore 1.1 - - template: .azure/tests.yml - parameters: - netcore1Global: false - - job: win - dependsOn: - - macOs - - linux pool: name: Hosted VS2017 steps: - - template: .azure/tests.yml - - - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - - task: NuGetCommand@2 - displayName: push nuget packages - inputs: - command: push - packagesToPush: '$(Build.ArtifactStagingDirectory)/*.nupkg' - nuGetFeedType: external - publishFeedCredentials: api.nuget.org - - - task: PublishBuildArtifacts@1 + - task: Bash@3 inputs: - pathtoPublish: '$(Build.ArtifactStagingDirectory)' - artifactName: nupkgs + targetType: inline + script: docker-compose up -d