Skip to content

Commit a3c9272

Browse files
committed
fix: Robust CI
1 parent 0a03cd2 commit a3c9272

2 files changed

Lines changed: 5 additions & 10 deletions

File tree

.github/workflows/openactive-test-suite.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ jobs:
1111
steps:
1212
- name: Checkout
1313
uses: actions/checkout@v2
14-
with:
15-
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
1614
- name: Setup .NET Core 3.1.419
1715
uses: actions/setup-dotnet@v1
1816
with:
@@ -27,8 +25,6 @@ jobs:
2725
steps:
2826
- name: Checkout
2927
uses: actions/checkout@v2
30-
with:
31-
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
3228
- name: Setup .NET Core 3.1.419
3329
uses: actions/setup-dotnet@v1
3430
with:
@@ -52,7 +48,6 @@ jobs:
5248
- name: Checkout OpenActive.Server.NET
5349
uses: actions/checkout@v2
5450
with:
55-
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
5651
path: server
5752
- name: Use matching coverage/* branch ${{ github.head_ref }} in OpenActive Test Suite
5853
if: ${{ startsWith(github.head_ref, 'coverage/') }}
@@ -130,11 +125,7 @@ jobs:
130125
- name: Checkout OpenActive.Server.NET
131126
uses: actions/checkout@v2
132127
with:
133-
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
134128
path: server
135-
- name: Remove Nerdbank.GitVersioning as it interferes with the .NET Framework build
136-
run: git rm Directory.Build.props
137-
working-directory: server
138129
- name: Use matching coverage/* branch ${{ github.head_ref }} in OpenActive Test Suite
139130
if: ${{ startsWith(github.head_ref, 'coverage/') }}
140131
id: refs
@@ -233,6 +224,8 @@ jobs:
233224
uses: actions/checkout@v2
234225
with:
235226
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
227+
- name: Install Nerdbank.GitVersioning
228+
run: cp Directory.Build.props.template Directory.Build.props
236229
- name: Get current version
237230
uses: dotnet/nbgv@master
238231
id: nbgv
@@ -263,7 +256,7 @@ jobs:
263256
body: |
264257
This release contains minor amendments based on updates to the [OpenActive Vocabulary](https://openactive.io/ns/) (codified by the [Data Models](https://github.com/openactive/data-models)), and the latest version of the [Dataset Site Template](https://github.com/openactive/dataset-site-template).
265258
266-
Published to [Nuget](https://www.nuget.org/packages/OpenActive.Server.NET/${{ steps.nbgv.outputs.SimpleVersion }}).
259+
Published to Nuget: [OpenActive.Server.NET](https://www.nuget.org/packages/OpenActive.Server.NET/${{ steps.nbgv.outputs.SimpleVersion }}) and [OpenActive.FakeDatabase.NET](https://www.nuget.org/packages/OpenActive.FakeDatabase.NET/${{ steps.nbgv.outputs.SimpleVersion }}).
267260
draft: false
268261
prerelease: false
269262

@@ -279,6 +272,8 @@ jobs:
279272
uses: actions/checkout@v2
280273
with:
281274
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
275+
- name: Install Nerdbank.GitVersioning
276+
run: cp Directory.Build.props.template Directory.Build.props
282277
- name: Get current version
283278
uses: dotnet/nbgv@master
284279
id: nbgv

0 commit comments

Comments
 (0)