From 13efe887358e9d2555a476e7e6e43b7e9b6fdc34 Mon Sep 17 00:00:00 2001 From: cra0zy Date: Fri, 9 Aug 2019 21:56:47 +0200 Subject: [PATCH] Add versions to azure pipelines --- .travis.yml | 24 ------------------------ azure-pipelines.yml | 6 +++++- build.cake | 6 +----- 3 files changed, 6 insertions(+), 30 deletions(-) delete mode 100755 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100755 index 300c3e619..000000000 --- a/.travis.yml +++ /dev/null @@ -1,24 +0,0 @@ -language: csharp -mono: latest -dotnet: 2.0.0 -dist: trusty -script: -- "./build.sh --BuildTarget=FullBuild" -deploy: - - provider: releases - skip_cleanup: true - api_key: - secure: rg2WI5q/uyxotAuUCMxv4L+kMVxd3Ge/1Oe7GytqDsdn/bW2HpxAG8CessB+nrQBKVSssOPU5puBG0c91aKcZFzWycZYN0AnUg8otILHBpJFg9A4igRPi4fAgdQodEXWAHuzeAP0EKl1c8RnBA5b4cHTsgZe/uy1r1rLg5PLA9ZKKCe/0kqFUQxwN3HvrysjvEyzS5fw5ILjwUZyRA+hzfBB5HD4Z7DkwKOmdOwdd9qNo4RxFVWIpUw7Fd3IaHDtjjqAJkZIwQA2+LL+4YBk+7reLGE/V0sDe3cK3rOfse/axQeD3ha1ASK4Q2Ye0yAfEKsxg3NrAPkPyF4CFhnTqtauwPKCEfkNyOlpum9T++2VepSN3qd3E58/K9aNmemilU+Z4KE4hMzJeY4OG3PBmSvp/F7ALNIBDL1BzltTCGbHX7vXKONKtRbDgUA6tX9qXxpf806KWfO7CpClibgLHGjF2jQOP0Eamn7vbCHCqbR8JLS5MolcsefLoatgg8zoK0670axrRIwV/UWnLSBHyo9rtOHnSBfh1r9TGOqO5h1ICa24nz6gUN1b4mP9B9nZsVzuWPWFSjJFPtmBOfOprLwP/xN6bwQgW3p4bVQLGF4/CuGRlnIhVl+hgFZNcobmkwyvFvAd2h/523KLUz0epNzYlk4vi5r1nP2vIIafLps= - file_glob: true - file: BuildOutput/NugetPackages/* - on: - branch: master - repo: GtkSharp/GtkSharp - tags: true - - provider: script - skip_cleanup: true - script: chmod +x pushnuget.sh && ./pushnuget.sh - on: - branch: master - repo: GtkSharp/GtkSharp - tags: true diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fcee8fed9..e47e46d5c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,3 +1,7 @@ +variables: + versionbase: 3.22.25 + increment: $[counter(variables['versionbase'], 1)] + version: $(versionbase).$(increment) trigger: branches: @@ -12,5 +16,5 @@ pool: vmImage: 'ubuntu-latest' steps: -- script: ./build.sh --BuildTarget=FullBuild +- script: ./build.sh --BuildTarget=FullBuild --BuildVersion=$(version) displayName: 'CAKE Script' diff --git a/build.cake b/build.cake index f9fec23cc..0f316da30 100644 --- a/build.cake +++ b/build.cake @@ -6,7 +6,7 @@ // VARS Settings.Cake = Context; -Settings.Version = "3.22.24.30"; +Settings.Version = Argument("BuildVersion", "3.22.24.30"); Settings.BuildTarget = Argument("BuildTarget", "Default"); Settings.Assembly = Argument("Assembly", ""); var configuration = Argument("Configuration", "Release"); @@ -19,10 +19,6 @@ var list = new List(); Task("Init") .Does(() => { - var version = System.Environment.GetEnvironmentVariable("TRAVIS_TAG"); - if (!string.IsNullOrEmpty(version)) - Settings.Version = version; - // Assign some common properties msbuildsettings = msbuildsettings.WithProperty("Version", Settings.Version); msbuildsettings = msbuildsettings.WithProperty("Authors", "'GtkSharp Contributors'");