Skip to content
This repository was archived by the owner on Sep 3, 2024. It is now read-only.

Commit 5499132

Browse files
thefringeninjathefringeninja
committed
build script updates
- Bullseye 2.2.0 - SimpleExec 3.0.0 - Replaced versioning nightmare wih minver
1 parent 2f5a6d7 commit 5499132

7 files changed

Lines changed: 17 additions & 90 deletions

File tree

‎Dockerfile‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
FROM microsoft/dotnet:2.1.403-sdk-alpine3.7 AS build
2-
ARG TRAVIS_BUILD_NUMBER
3-
ARG TRAVIS_PULL_REQUEST_SHA
4-
ARG TRAVIS_COMMIT
5-
ARG TRAVIS_PULL_REQUEST
6-
ARG TRAVIS_BRANCH
2+
ARG TRAVIS_OS_NAME
73
ARG MYGET_API_KEY
84

95
RUN apk add nodejs yarn --no-cache
@@ -34,12 +30,8 @@ COPY ./build .
3430

3531
WORKDIR /
3632

37-
RUN TRAVIS_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER \
33+
RUN TRAVIS_OS_NAME=$TRAVIS_OS_NAME \
3834
MYGET_API_KEY=$MYGET_API_KEY \
39-
TRAVIS_PULL_REQUEST_SHA=$TRAVIS_PULL_REQUEST_SHA \
40-
TRAVIS_COMMIT=$TRAVIS_COMMIT \
41-
TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST \
42-
TRAVIS_BRANCH=$TRAVIS_BRANCH \
4335
dotnet run --project build/build.csproj
4436

4537
FROM microsoft/dotnet:2.1.5-runtime-deps-alpine3.7 AS runtime

‎build.sh‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
#!/usr/bin/env bash
2+
set -e
3+
24
DOCKERTAG=${TRAVIS_TAG:-latest}
35

46
docker build \
5-
--build-arg TRAVIS_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER \
7+
--build-arg TRAVIS_OS_NAME=$TRAVIS_OS_NAME \
68
--build-arg MYGET_API_KEY=$MYGET_API_KEY \
7-
--build-arg TRAVIS_PULL_REQUEST_SHA=$TRAVIS_PULL_REQUEST_SHA \
8-
--build-arg TRAVIS_COMMIT=$TRAVIS_COMMIT \
9-
--build-arg TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST \
10-
--build-arg TRAVIS_BRANCH=$TRAVIS_BRANCH \
119
--tag sql-stream-store-server:${DOCKERTAG} \
12-
. && \
13-
docker images --filter=reference="sql-stream-store-server:${DOCKERTAG}"
10+
.
11+
12+
docker images --filter=reference="sql-stream-store-server:${DOCKERTAG}"

‎build/Program.cs‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ static class Program
2121

2222
public static void Main(string[] args)
2323
{
24-
var buildNumber = GetBuildNumber();
25-
var branch = GetBranch();
26-
var commitHash = GetCommitHash();
27-
var buildMetadata = $"{branch}.{commitHash}";
2824
var apiKey = Environment.GetEnvironmentVariable("MYGET_API_KEY");
2925

3026
Target(Clean, () =>
@@ -78,7 +74,7 @@ public static void Main(string[] args)
7874
DependsOn(GenerateDocumentation),
7975
() => Run(
8076
"dotnet",
81-
$"build src/SqlStreamStore.HAL.sln -c Release /p:BuildNumber={buildNumber} /p:BuildMetadata={buildMetadata}"));
77+
$"build src/SqlStreamStore.HAL.sln -c Release"));
8278

8379
Target(
8480
RunTests,
@@ -92,14 +88,14 @@ public static void Main(string[] args)
9288
DependsOn(Build),
9389
() => Run(
9490
"dotnet",
95-
$"publish --configuration=Release --output=../../{PublishDir} --runtime=alpine.3.7-x64 /p:ShowLinkerSizeComparison=true /p:BuildNumber={buildNumber} /p:BuildMetadata={buildMetadata} src/SqlStreamStore.HAL.DevServer "));
91+
$"publish --configuration=Release --output=../../{PublishDir} --runtime=alpine.3.7-x64 /p:ShowLinkerSizeComparison=true src/SqlStreamStore.HAL.DevServer"));
9692

9793
Target(
9894
Pack,
9995
DependsOn(Publish),
10096
() => Run(
10197
"dotnet",
102-
$"pack src/SqlStreamStore.HAL -c Release -o ../../{ArtifactsDir} /p:BuildNumber={buildNumber} /p:BuildMetadata={buildMetadata} --no-build"));
98+
$"pack src/SqlStreamStore.HAL -c Release -o ../../{ArtifactsDir} --no-build"));
10399

104100
Target(
105101
Push,
@@ -127,19 +123,4 @@ public static void Main(string[] args)
127123

128124
RunTargets(args);
129125
}
130-
131-
private static string GetBranch()
132-
=> (Environment.GetEnvironmentVariable("TRAVIS_PULL_REQUEST")?.ToLower() == "false"
133-
? null
134-
: $"pr-{Environment.GetEnvironmentVariable("TRAVIS_PULL_REQUEST")}")
135-
?? Environment.GetEnvironmentVariable("TRAVIS_BRANCH")
136-
?? "none";
137-
138-
private static string GetCommitHash()
139-
=> Environment.GetEnvironmentVariable("TRAVIS_PULL_REQUEST_SHA")
140-
?? Environment.GetEnvironmentVariable("TRAVIS_COMMIT")
141-
?? "none";
142-
143-
private static string GetBuildNumber()
144-
=> (Environment.GetEnvironmentVariable("TRAVIS_BUILD_NUMBER") ?? "0");
145126
}

‎build/build.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Bullseye" Version="1.2.0-rc.2" />
10-
<PackageReference Include="SimpleExec" Version="2.3.0" />
9+
<PackageReference Include="Bullseye" Version="2.2.0" />
10+
<PackageReference Include="SimpleExec" Version="3.0.0" />
1111
</ItemGroup>
1212

1313
</Project>

‎src/Directory.Build.props‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<PropertyGroup>
4-
<BuildNumber Condition="'$(BuildNumber)' == ''">0</BuildNumber>
5-
<BuildMetadata Condition="'$(BuildMetadata)' == ''">local</BuildMetadata>
6-
<VersionPrefix>1.0.0</VersionPrefix>
7-
<VersionSuffix>rc3.$(BuildNumber)</VersionSuffix>
8-
<InformationalVersion>$(VersionPrefix)-$(VersionSuffix)+$(BuildMetadata)</InformationalVersion>
94
<Authors>João P. Bragança</Authors>
105
<PackageProjectUrl>https://github.com/SqlStreamStore/SqlStreamStore.HAL</PackageProjectUrl>
116
<PackageLicenseUrl>https://github.com/SqlStreamStore/SqlStreamStore.HAL/blob/master/LICENSE</PackageLicenseUrl>
127
<GenerateDocumentationFile>true</GenerateDocumentationFile>
138
<PackageTags>cqrs;event-sourcing;event-store;stream-store</PackageTags>
149
</PropertyGroup>
10+
<ItemGroup>
11+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All" />
12+
<PackageReference Include="MinVer" Version="1.0.0-alpha.*" />
13+
</ItemGroup>
1514
</Project>

‎src/SqlStreamStore.HAL.Tests/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎src/SqlStreamStore.HAL.Tests/SqlStreamStore.HAL.Tests.csproj‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
44
<AssemblyName>SqlStreamStore.HAL.Tests</AssemblyName>
55
<PackageId>SqlStreamStore.HAL.Tests</PackageId>
6-
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
7-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
8-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
9-
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
10-
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
11-
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
12-
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
136
<DebugType>portable</DebugType>
147
<DebugSymbols>true</DebugSymbols>
158
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>

0 commit comments

Comments
 (0)