Skip to content

Commit 74db309

Browse files
HHobeckHHobeck
committed
Merge branch main into 'feature/3101'
2 parents a5f3d5e + da99ec9 commit 74db309

File tree

9 files changed

+38
-34
lines changed

9 files changed

+38
-34
lines changed

‎.github/workflows/ci.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
-
5151
name: Cache cake frosting
5252
id: cache-cake
53-
uses: actions/[email protected].9
53+
uses: actions/[email protected].10
5454
with:
5555
path: run
5656
key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
@@ -82,14 +82,14 @@ jobs:
8282
-
8383
name: Use cached cake frosting
8484
id: cache-cake
85-
uses: actions/[email protected].9
85+
uses: actions/[email protected].10
8686
with:
8787
path: run
8888
key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
8989
-
9090
name: Use cached tools
9191
id: cache-tools
92-
uses: actions/[email protected].9
92+
uses: actions/[email protected].10
9393
with:
9494
path: tools
9595
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
@@ -148,14 +148,14 @@ jobs:
148148
-
149149
name: Use cached cake frosting
150150
id: cache-cake
151-
uses: actions/[email protected].9
151+
uses: actions/[email protected].10
152152
with:
153153
path: run
154154
key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
155155
-
156156
name: Use cached tools
157157
id: cache-tools
158-
uses: actions/[email protected].9
158+
uses: actions/[email protected].10
159159
with:
160160
path: tools
161161
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
@@ -194,14 +194,14 @@ jobs:
194194
-
195195
name: Use cached cake frosting
196196
id: cache-cake
197-
uses: actions/[email protected].9
197+
uses: actions/[email protected].10
198198
with:
199199
path: run
200200
key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
201201
-
202202
name: Use cached tools
203203
id: cache-tools
204-
uses: actions/[email protected].9
204+
uses: actions/[email protected].10
205205
with:
206206
path: tools
207207
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
@@ -240,14 +240,14 @@ jobs:
240240
-
241241
name: Use cached cake frosting
242242
id: cache-cake
243-
uses: actions/[email protected].9
243+
uses: actions/[email protected].10
244244
with:
245245
path: run
246246
key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
247247
-
248248
name: Use cached tools
249249
id: cache-tools
250-
uses: actions/[email protected].9
250+
uses: actions/[email protected].10
251251
with:
252252
path: tools
253253
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
@@ -304,14 +304,14 @@ jobs:
304304
-
305305
name: Use cached cake frosting
306306
id: cache-cake
307-
uses: actions/[email protected].9
307+
uses: actions/[email protected].10
308308
with:
309309
path: run
310310
key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
311311
-
312312
name: Use cached tools
313313
id: cache-tools
314-
uses: actions/[email protected].9
314+
uses: actions/[email protected].10
315315
with:
316316
path: tools
317317
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
@@ -402,14 +402,14 @@ jobs:
402402
-
403403
name: Use cached cake frosting
404404
id: cache-cake
405-
uses: actions/[email protected].9
405+
uses: actions/[email protected].10
406406
with:
407407
path: run
408408
key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
409409
-
410410
name: Use cached tools
411411
id: cache-tools
412-
uses: actions/[email protected].9
412+
uses: actions/[email protected].10
413413
with:
414414
path: tools
415415
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
@@ -444,14 +444,14 @@ jobs:
444444
-
445445
name: Use cached cake frosting
446446
id: cache-cake
447-
uses: actions/[email protected].9
447+
uses: actions/[email protected].10
448448
with:
449449
path: run
450450
key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
451451
-
452452
name: Use cached tools
453453
id: cache-tools
454-
uses: actions/[email protected].9
454+
uses: actions/[email protected].10
455455
with:
456456
path: tools
457457
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}

‎.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
-
5353
name: Cache cake frosting
5454
id: cache-cake
55-
uses: actions/[email protected].9
55+
uses: actions/[email protected].10
5656
with:
5757
path: run
5858
key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}

‎.github/workflows/docs.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ jobs:
4545
-
4646
name: Cache cake frosting
4747
id: cache-cake
48-
uses: actions/[email protected].9
48+
uses: actions/[email protected].10
4949
with:
5050
path: run
5151
key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
5252
-
5353
name: Use cached tools
5454
id: cache-tools
55-
uses: actions/[email protected].9
55+
uses: actions/[email protected].10
5656
with:
5757
path: tools
5858
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
@@ -63,7 +63,7 @@ jobs:
6363
-
6464
name: Cache Node Modules
6565
id: cache-node
66-
uses: actions/[email protected].9
66+
uses: actions/[email protected].10
6767
with:
6868
path: ${{ steps.cache-node-dir.outputs.dir }}
6969
key: node-${{ runner.os }}-${{ hashFiles('./package-lock.json') }}
@@ -91,14 +91,14 @@ jobs:
9191
-
9292
name: Use cached cake frosting
9393
id: cache-cake
94-
uses: actions/[email protected].9
94+
uses: actions/[email protected].10
9595
with:
9696
path: run
9797
key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
9898
-
9999
name: Use cached tools
100100
id: cache-tools
101-
uses: actions/[email protected].9
101+
uses: actions/[email protected].10
102102
with:
103103
path: tools
104104
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
@@ -148,14 +148,14 @@ jobs:
148148
-
149149
name: Use cached cake frosting
150150
id: cache-cake
151-
uses: actions/[email protected].9
151+
uses: actions/[email protected].10
152152
with:
153153
path: run
154154
key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
155155
-
156156
name: Use cached tools
157157
id: cache-tools
158-
uses: actions/[email protected].9
158+
uses: actions/[email protected].10
159159
with:
160160
path: tools
161161
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}

‎.github/workflows/homebrew.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: Bump Homebrew formula
1515
runs-on: macos-latest
1616
steps:
17-
- uses: dawidd6/[email protected].0
17+
- uses: dawidd6/[email protected].3
1818
with:
1919
# GitHub token, required, not the default one
2020
token: ${{secrets.RELEASE_GITHUB_TOKEN}}

‎src/GitVersion.Core.Tests/VersionCalculation/VersionSourceTests.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using GitTools.Testing;
22
using GitVersion.Core.Tests.Helpers;
3+
using GitVersion.Core.Tests.IntegrationTests;
34
using GitVersion.VersionCalculation;
45
using LibGit2Sharp;
56
using Microsoft.Extensions.DependencyInjection;
@@ -60,11 +61,11 @@ public void VersionSourceShaUsingTag()
6061

6162
var nextVersionCalculator = GetNextVersionCalculator(fixture);
6263

63-
var version = nextVersionCalculator.FindVersion();
64+
var nextVersion = nextVersionCalculator.FindVersion();
6465

65-
version.IncrementedVersion.BuildMetaData.ShouldNotBeNull();
66-
version.IncrementedVersion.BuildMetaData.VersionSourceSha.ShouldBe(secondCommit.Sha);
67-
version.IncrementedVersion.BuildMetaData.CommitsSinceVersionSource.ShouldBe(1);
66+
nextVersion.IncrementedVersion.BuildMetaData.ShouldNotBeNull();
67+
nextVersion.IncrementedVersion.BuildMetaData.VersionSourceSha.ShouldBe(secondCommit.Sha);
68+
nextVersion.IncrementedVersion.BuildMetaData.CommitsSinceVersionSource.ShouldBe(1);
6869
}
6970

7071
private static INextVersionCalculator GetNextVersionCalculator(RepositoryFixtureBase fixture)

‎src/GitVersion.Core/Core/Abstractions/IRepositoryStore.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ public interface IRepositoryStore
88
/// Find the merge base of the two branches, i.e. the best common ancestor of the two branches' tips.
99
/// </summary>
1010
ICommit? FindMergeBase(IBranch? branch, IBranch? otherBranch);
11+
1112
ICommit? FindMergeBase(ICommit commit, ICommit mainlineTip);
1213
ICommit? GetCurrentCommit(IBranch currentBranch, string? commitId);
1314
IEnumerable<ICommit> GetMainlineCommitLog(ICommit? baseVersionSource, ICommit? mainlineTip);

‎src/GitVersion.Core/VersionCalculation/NextVersionCalculator.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public NextVersionCalculator(ILog log, IMainlineVersionCalculator mainlineVersio
2828
this.log = log.NotNull();
2929
this.mainlineVersionCalculator = mainlineVersionCalculator.NotNull();
3030
this.repositoryStore = repositoryStore.NotNull();
31+
this.incrementStrategyFinder = incrementStrategyFinder.NotNull();
3132
this.versionContext = versionContext.NotNull();
3233
this.versionStrategies = versionStrategies.NotNull().ToArray();
3334
this.effectiveBranchConfigurationFinder = effectiveBranchConfigurationFinder.NotNull();

‎src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -334,9 +334,3 @@ public SemanticVersion IncrementVersion(VersionField incrementStrategy)
334334
return incremented;
335335
}
336336
}
337-
338-
public enum SemanticVersionFormat
339-
{
340-
Strict,
341-
Loose
342-
}

‎src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionFormat.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace GitVersion;
2+
3+
public enum SemanticVersionFormat
4+
{
5+
Strict,
6+
Loose
7+
}

0 commit comments

Comments
 (0)