changing how we do semantic versioning

Author: thefringeninja

Dockerfile

@@ -1,5 +1,9 @@
 FROM microsoft/dotnet:2.1.403-sdk-alpine3.7 AS build
 ARG TRAVIS_BUILD_NUMBER
+ARG TRAVIS_PULL_REQUEST_SHA
+ARG TRAVIS_COMMIT
+ARG TRAVIS_PULL_REQUEST
+ARG TRAVIS_BRANCH
 ARG MYGET_API_KEY
 WORKDIR /src
 
@@ -23,7 +27,13 @@ COPY ./build .
 
 WORKDIR /
 
-RUN TRAVIS_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER MYGET_API_KEY=$MYGET_API_KEY dotnet run --project build/build.csproj
+RUN TRAVIS_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER \
+  MYGET_API_KEY=$MYGET_API_KEY \
+  TRAVIS_PULL_REQUEST_SHA=$TRAVIS_PULL_REQUEST_SHA \
+  TRAVIS_COMMIT=$TRAVIS_COMMIT \
+  TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST \
+  TRAVIS_BRANCH=$TRAVIS_BRANCH \
+  dotnet run --project build/build.csproj
 
 FROM build as publish
 

build.sh

@@ -4,6 +4,10 @@ DOCKERTAG=${TRAVIS_TAG:-latest}
 docker build \
     --build-arg TRAVIS_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER \
     --build-arg MYGET_API_KEY=$MYGET_API_KEY \
+    --build-arg TRAVIS_PULL_REQUEST_SHA=$TRAVIS_PULL_REQUEST_SHA \
+    --build-arg TRAVIS_COMMIT=$TRAVIS_COMMIT \
+    --build-arg TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST \
+    --build-arg TRAVIS_BRANCH=$TRAVIS_BRANCH \
     --tag sql-stream-store-server:${DOCKERTAG} \
     . && \
 docker images --filter=reference="sql-stream-store-server:${DOCKERTAG}"

build/Program.cs

@@ -15,8 +15,10 @@ static class Program
 
     public static void Main(string[] args)
     {
-        var buildNumber = Environment.GetEnvironmentVariable("TRAVIS_BUILD_NUMBER") ?? "0";
-        var versionSuffix = "build" + buildNumber.PadLeft(5, '0');
+        var buildNumber = GetBuildNumber();
+        var branch = GetBranch();
+        var commitHash = GetCommitHash();
+        var buildMetadata = $"build.{buildNumber}.{branch}.{commitHash}";
         var apiKey = Environment.GetEnvironmentVariable("MYGET_API_KEY");
 
         Target(Clean, () =>
@@ -27,7 +29,11 @@ public static void Main(string[] args)
             }
         });
 
-        Target(Build, () => Run("dotnet", "build src/SqlStreamStore.HAL.sln -c Release"));
+        Target(
+            Build, 
+            () => Run(
+                "dotnet", 
+                $"build src/SqlStreamStore.HAL.sln -c Release /p:BuildMetadata={buildMetadata}"));
 
         Target(
             RunTests,
@@ -38,30 +44,49 @@ public static void Main(string[] args)
 
         Target(
             Pack,
-            DependsOn(Build),
-            () => Run("dotnet",
-                $"pack src/SqlStreamStore.HAL -c Release -o ../../{ArtifactsDir} --no-build --version-suffix {versionSuffix}"));
-
-        Target(Publish, DependsOn(Pack), () =>
-        {
-            var packagesToPush = Directory.GetFiles(ArtifactsDir, "*.nupkg", SearchOption.TopDirectoryOnly);
-            Console.WriteLine($"Found packages to publish: {string.Join("; ", packagesToPush)}");
-
-            if (string.IsNullOrWhiteSpace(apiKey))
-            {
-                Console.WriteLine("MyGet API key not available. Packages will not be pushed.");
-                return;
-            }
+            DependsOn(Build), 
+            () => Run(
+                "dotnet",
+                $"pack src/SqlStreamStore.HAL -c Release -o ../../{ArtifactsDir} --no-build"));
 
-            foreach (var packageToPush in packagesToPush)
-            {
-                Run("dotnet",
-                    $"nuget push {packageToPush} -s https://www.myget.org/F/sqlstreamstore/api/v3/index.json -k {apiKey}");
-            }
-        });
+        Target(
+            Publish, 
+            DependsOn(Pack), 
+            () => {
+                var packagesToPush = Directory.GetFiles(ArtifactsDir, "*.nupkg", SearchOption.TopDirectoryOnly);
+                Console.WriteLine($"Found packages to publish: {string.Join("; ", packagesToPush)}");
+    
+                if (string.IsNullOrWhiteSpace(apiKey))
+                {
+                    Console.WriteLine("MyGet API key not available. Packages will not be pushed.");
+                    return;
+                }
+    
+                foreach (var packageToPush in packagesToPush)
+                {
+                    Run(
+                        "dotnet",
+                        $"nuget push {packageToPush} -s https://www.myget.org/F/sqlstreamstore/api/v3/index.json -k {apiKey}");
+                }
+            });
 
         Target("default", DependsOn(Clean, RunTests, Publish));
 
         RunTargets(args);
     }
-}
+
+    private static string GetBranch()
+        => (Environment.GetEnvironmentVariable("TRAVIS_PULL_REQUEST")?.ToLower() == "false"
+                ? null
+                : $"pr-{Environment.GetEnvironmentVariable("TRAVIS_PULL_REQUEST")}")
+            ?? Environment.GetEnvironmentVariable("TRAVIS_BRANCH") 
+            ?? "none";
+
+    private static string GetCommitHash() 
+        => Environment.GetEnvironmentVariable("TRAVIS_PULL_REQUEST_SHA")
+            ?? Environment.GetEnvironmentVariable("TRAVIS_COMMIT")
+            ?? "none";
+
+    private static string GetBuildNumber()
+        => (Environment.GetEnvironmentVariable("TRAVIS_BUILD_NUMBER") ?? "0").PadLeft(5, '0');
+}

src/Directory.Build.props

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <VersionPrefix>1.0.0</VersionPrefix>
     <VersionSuffix>rc2</VersionSuffix>
+    <InformationalVersion>$(VersionPrefix)-$(VersionSuffix)+$(BuildMetadata)</InformationalVersion>
     <Authors>João P. Bragança</Authors>
     <PackageProjectUrl>https://github.com/SqlStreamStore/SqlStreamStore.HAL</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/SqlStreamStore/SqlStreamStore.HAL/blob/master/LICENSE</PackageLicenseUrl>