Skip to content

Commit 7aac988

Browse files
authored
Merge pull request #219 from graphql-dotnet/adapt-workflows-to-github-flow
Adapt Workflows to GitHubFlow
2 parents 32d9e47 + 8a45417 commit 7aac988

File tree

5 files changed

+8
-183
lines changed

5 files changed

+8
-183
lines changed

.github/workflows/branches-windows.yml

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

.github/workflows/branches-ubuntu.yml renamed to .github/workflows/branches.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
name: Branch workflow (Ubuntu)
1+
name: Branch workflow
22
on:
33
push:
44
branches-ignore:
5-
- develop
5+
- master
66
- 'release/**'
77
- 'releases/**'
8+
pull_request:
89
env:
910
DOTNET_CLI_TELEMETRY_OPTOUT: true
1011
MSBUILDSINGLELOADCONTEXT: 1
@@ -22,7 +23,7 @@ jobs:
2223
- name: Fetch complete repository including tags
2324
run: git fetch --tags --force --prune && git describe
2425
- name: Generate version info from git history
25-
run: dotnet gitversion /output json > gitversion.json
26+
run: dotnet gitversion /output json > gitversion.json && cat gitversion.json
2627
- name: Upload version info file
2728
uses: actions/upload-artifact@v1
2829
with:

.github/workflows/main-windows.yml

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

.github/workflows/main-ubuntu.yml renamed to .github/workflows/master.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
name: Main workflow (Ubuntu)
1+
name: Master workflow
22
on:
33
push:
44
branches:
5-
- develop
5+
- master
66
- 'release/**'
77
- 'releases/**'
88
tags:
@@ -26,7 +26,7 @@ jobs:
2626
- name: Fetch complete repository including tags
2727
run: git fetch --tags --force --prune && git describe
2828
- name: Generate version info from git history
29-
run: dotnet gitversion /output json > gitversion.json
29+
run: dotnet gitversion /output json > gitversion.json && cat gitversion.json
3030
- name: Upload version info file
3131
uses: actions/upload-artifact@v1
3232
with:

GitVersion.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
mode: ContinuousDeployment
1+
mode: Mainline

0 commit comments

Comments
 (0)