Skip to content

Commit 7666489

Browse files
rojiroji
committed
Replace GitVersion with manual bumping
1 parent 302c029 commit 7666489

5 files changed

Lines changed: 47 additions & 19 deletions

File tree

‎.teamcity/npgsql/buildTypes/RunNpgsqlTests.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<build-runners>
1010
<runner id="RUNNER_31" name="Set build number" type="simpleRunner">
1111
<parameters>
12-
<param name="script.content" value="echo ##teamcity[buildNumber '%dep.npgsql_CompileDebug.GitVersion.NuGetVersion%']" />
12+
<param name="script.content" value="echo ##teamcity[buildNumber '%dep.npgsql_CompileDebug.build.number%']" />
1313
<param name="teamcity.step.mode" value="default" />
1414
<param name="use.custom.script" value="true" />
1515
</parameters>

‎.teamcity/npgsql/buildTypes/npgsql_CompileDebug.xml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,16 @@
99
</options>
1010
<parameters />
1111
<build-runners>
12-
<runner id="RUNNER_9" name="GitVersion" type="simpleRunner">
12+
<runner id="RUNNER_9" name="Set build number" type="simpleRunner">
1313
<parameters>
14-
<param name="command.executable" value="GitVersion" />
15-
<param name="command.parameters" value="/output buildserver /UpdateAssemblyInfo src\CommonAssemblyInfo.cs" />
14+
<param name="command.executable" value="teamcity_set_version.cmd" />
15+
<param name="command.parameters" value="%build.counter%" />
1616
<param name="teamcity.step.mode" value="default" />
1717
</parameters>
1818
</runner>
19-
<runner id="RUNNER_33" name="Set build number" type="simpleRunner">
20-
<parameters>
21-
<param name="script.content" value="echo ##teamcity[buildNumber '%GitVersion.NuGetVersion%']" />
22-
<param name="teamcity.step.mode" value="default" />
23-
<param name="use.custom.script" value="true" />
24-
</parameters>
25-
</runner>
2619
<runner id="RUNNER_17" name="Compile Debug" type="simpleRunner">
2720
<parameters>
28-
<param name="script.content"><![CDATA[for /f "tokens=1,2 delims=-" %%%%a in ("%GitVersion.NuGetVersion%") do set base=%%%%a&set NUGET_PRERELEASE_TAG=%%%%b
29-
set KOREBUILD_DOTNET_PACK_OPTIONS=--version-suffix "%%NUGET_PRERELEASE_TAG%%"
21+
<param name="script.content"><![CDATA[set KOREBUILD_DOTNET_PACK_OPTIONS=--version-suffix "%build.counter%"
3022
set Configuration=DebugOptimizedCryptography
3123
build compile]]></param>
3224
<param name="teamcity.step.mode" value="default" />

‎.teamcity/npgsql/buildTypes/npgsql_CompileReleaseAndPush.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@
1414
<build-runners>
1515
<runner id="RUNNER_32" name="Set build number" type="simpleRunner">
1616
<parameters>
17-
<param name="script.content" value="echo ##teamcity[buildNumber '%dep.npgsql_CompileDebug.GitVersion.NuGetVersion%']" />
17+
<param name="script.content" value="echo ##teamcity[buildNumber '%dep.npgsql_CompileDebug.build.number%']" />
1818
<param name="teamcity.step.mode" value="default" />
1919
<param name="use.custom.script" value="true" />
2020
</parameters>
2121
</runner>
2222
<runner id="RUNNER_21" name="Compile" type="simpleRunner">
2323
<parameters>
24-
<param name="script.content"><![CDATA[for /f "tokens=1,2 delims=-" %%%%a in ("%dep.npgsql_CompileDebug.GitVersion.NuGetVersion%") do set base=%%%%a&set NUGET_PRERELEASE_TAG=%%%%b
25-
set KOREBUILD_DOTNET_PACK_OPTIONS=--version-suffix "%%NUGET_PRERELEASE_TAG%%"
24+
<param name="script.content"><![CDATA[set KOREBUILD_DOTNET_PACK_OPTIONS=--version-suffix "%dep.npgsql_CompileDebug.build.counter%"
2625
set Configuration=ReleaseOptimizedCryptography
2726
build compile]]></param>
2827
<param name="teamcity.step.mode" value="default" />

‎GitVersionConfig.yaml‎

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

‎bump.sh‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#!/bin/bash
2+
3+
if [ "$#" -ne 1 ]; then
4+
echo "usage: bump.sh <version>"
5+
exit 1
6+
fi
7+
8+
v=$1
9+
if [[ $v == *"-" ]]; then
10+
echo "Version must not end with -"
11+
exit 1
12+
fi
13+
14+
echo "echo ##teamcity[buildNumber '$v-%1']" > teamcity_set_version.cmd
15+
16+
if [[ $v == *"-"* ]]; then
17+
# Prerelease version
18+
19+
without_prerelease=`echo $v | cut -d- -f1`
20+
21+
sed -i 's/^\(\s*\)"version": "[^"]*"/\1"version": "'$v'-*"/' src/Npgsql/project.json
22+
23+
sed -i 's/AssemblyVersion("[^"]*")/AssemblyVersion("'$without_prerelease'")/' src/CommonAssemblyInfo.cs
24+
sed -i 's/AssemblyFileVersion("[^"]*")/AssemblyFileVersion("'$without_prerelease'")/' src/CommonAssemblyInfo.cs
25+
sed -i 's/AssemblyInformationalVersion("[^"]*")/AssemblyInformationalVersion("'$v'")/' src/CommonAssemblyInfo.cs
26+
else
27+
# Release version
28+
29+
sed -i 's/^\(\s*\)"version": "[^"]*"/\1"version": "'$v'"/' src/Npgsql/project.json
30+
31+
sed -i 's/AssemblyVersion("[^"]*")/AssemblyVersion("'$v'")/' src/CommonAssemblyInfo.cs
32+
sed -i 's/AssemblyFileVersion("[^"]*")/AssemblyFileVersion("'$v'")/' src/CommonAssemblyInfo.cs
33+
sed -i 's/AssemblyInformationalVersion("[^"]*")/AssemblyInformationalVersion("'$v'")/' src/CommonAssemblyInfo.cs
34+
fi
35+
36+
git add teamcity_set_version.cmd
37+
git add src/Npgsql/project.json
38+
git add src/CommonAssemblyInfo.cs
39+
40+
git commit -m "Bump version to $v"

0 commit comments

Comments
 (0)