Skip to content

Commit 6f11153

Browse files
codebudecodebude
committed
Fine-tuning the build-script
1 parent a684d7d commit 6f11153

File tree

3 files changed

+87
-10
lines changed

3 files changed

+87
-10
lines changed

‎.github/workflows/wf-build-release-ci.yml

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ jobs:
1313
- uses: actions/checkout@v1
1414
name: Checkout Code
1515

16+
- name: Install .NET 6
17+
uses: actions/setup-dotnet@v1
18+
with:
19+
dotnet-version: '6.0.x'
20+
1621
- name: Setup MSBuild Path
1722
uses: microsoft/setup-msbuild@v1
1823

@@ -40,52 +45,71 @@ jobs:
4045
with:
4146
name: Compiled project
4247
path: D:\a\qrcoder\qrcoder
48+
49+
- name: Install .NET 6
50+
uses: actions/setup-dotnet@v1
51+
with:
52+
dotnet-version: '6.0.x'
53+
4354
- name: Run test .NET 3.5
4455
run: dotnet test -c Release -f net35 --nologo --no-build # No coverage for NET3.5 because of bug in combination with Coverlet+Stron naming
56+
4557
- name: Run test .NET 4.52
4658
run: dotnet test -c Release -f net452 --nologo --no-build # No coverage for NET4.5 because of bug in combination with Coverlet+Stron naming
47-
- name: Run test .NET Core 1.3
48-
run: dotnet test -c Release -f netcoreapp1.3 --nologo /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
59+
60+
# Skip 1.3 test due to missing support on Github runner
61+
# - name: Run test .NET Core 1.3
62+
# run: dotnet test -c Release -f netcoreapp1.3 --nologo
63+
4964
- name: Run test .NET Core 2.0
5065
run: dotnet test -c Release -f netcoreapp2.0 --nologo /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
66+
5167
- name: Run test .NET 5.0
5268
run: dotnet test -c Release -f net5.0 --nologo --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
69+
5370
- name: Run test .NET 5.0 Windows
5471
run: dotnet test -c Release -f net5.0-windows --nologo --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
72+
5573
- name: Run test .NET 6.0
5674
run: dotnet test -c Release -f net6.0 --nologo --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
75+
5776
- name: Run test .NET 6.0 Windows
5877
run: dotnet test -c Release -f net6.0-windows --nologo --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
78+
5979
- name: Codecov update netcoreapp2.0
6080
uses: codecov/codecov-action@v2
6181
with:
6282
token: ${{ secrets.CODECOV_TOKEN }}
6383
files: ./QRCoderTests/coverage.netcoreapp2.0.opencover.xml
6484
flags: netcoreapp2.0
85+
6586
- name: Codecov update net5.0
6687
uses: codecov/codecov-action@v2
6788
with:
6889
token: ${{ secrets.CODECOV_TOKEN }}
6990
files: ./QRCoderTests/coverage.net5.0.opencover.xml
7091
flags: net5.0
92+
7193
- name: Codecov update net5.0-windows
7294
uses: codecov/codecov-action@v2
7395
with:
7496
token: ${{ secrets.CODECOV_TOKEN }}
7597
files: ./QRCoderTests/coverage.net5.0-windows.opencover.xml
7698
flags: net5.0-windows
99+
77100
- name: Codecov update net6.0
78101
uses: codecov/codecov-action@v2
79102
with:
80103
token: ${{ secrets.CODECOV_TOKEN }}
81104
files: ./QRCoderTests/coverage.net5.0.opencover.xml
82-
flags: net5.0
105+
flags: net6.0
106+
83107
- name: Codecov update net6.0-windows
84108
uses: codecov/codecov-action@v2
85109
with:
86110
token: ${{ secrets.CODECOV_TOKEN }}
87111
files: ./QRCoderTests/coverage.net5.0-windows.opencover.xml
88-
flags: net5.0-windows
112+
flags: net6.0-windows
89113

90114

91115
pack-push-ci:
@@ -99,24 +123,39 @@ jobs:
99123
with:
100124
name: Compiled project
101125
path: D:\a\qrcoder\qrcoder
126+
127+
- name: Install .NET 6
128+
uses: actions/setup-dotnet@v1
129+
with:
130+
dotnet-version: '6.0.x'
131+
102132
- name: Restore dependencies
103133
run: dotnet restore
134+
104135
- name: Get assembly version QRCoder
105136
run: echo "ASSEM_VER=$([Reflection.Assembly]::Loadfile( $(-join($pwd,"\QRCoder\bin\Release\net40\QRCoder.dll"))).GetName().version.ToString())" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
137+
106138
- name: Clean assembly version QRCoder
107139
run: echo "ASSEM_VER_SHT=$($env:ASSEM_VER.substring(0, $env:ASSEM_VER.lastIndexOf(".")))" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
140+
108141
- name: Calculate ci suffix QRCoder
109142
run: echo "CI_TAG=-ci-$([datetime]::now.tostring("yyyyMMddHHmmss"))" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
143+
110144
- name: Get assembly version QRCoder.Xaml
111145
run: echo "ASSEM_VER_XAML=$([Reflection.Assembly]::Loadfile( $(-join($pwd,"\QRCoder.Xaml\bin\Release\net40\QRCoder.Xaml.dll"))).GetName().version.ToString())" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
146+
112147
- name: Clean assembly version QRCoder.Xaml
113148
run: echo "ASSEM_VER_SHT_XAML=$($env:ASSEM_VER_XAML.substring(0, $env:ASSEM_VER_XAML.lastIndexOf(".")))" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
149+
114150
- name: Calculate ci suffix QRCoder.Xaml
115151
run: echo "CI_TAG_XAML=-ci-$([datetime]::now.tostring("yyyyMMddHHmmss"))" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
152+
116153
- name: Build QRCoder NuGet package
117154
run: dotnet pack QRCoder\QRCoder.csproj -c Release --no-build /p:PackageVersion="$env:ASSEM_VER_SHT$env:CI_TAG" /p:PackageReleaseNotes="- This is an automatic CI build ($env:CI_TAG)`n- Please don't use it in productive environments!"
155+
118156
- name: Build QRCoder.Xaml NuGet package
119157
run: dotnet pack QRCoder.Xaml\QRCoder.Xaml.csproj -c Release --no-build /p:PackageVersion="$env:ASSEM_VER_SHT_XAML$env:CI_TAG_XAML" /p:PackageReleaseNotes="- This is an automatic CI build ($env:CI_TAG_XAML)`n- Please don't use it in productive environments!"
158+
120159
- name: Publish QRCoder and QRCoder.Xaml to Github packages
121160
run: dotnet nuget push "**/*.nupkg" --no-symbols --skip-duplicate --api-key $env:GH_PKG_SEC --source https://nuget.pkg.github.com/codebude/index.json
122161

‎.github/workflows/wf-build-release.yml

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v1
1515
name: Checkout Code
16+
17+
- name: Install .NET 6
18+
uses: actions/setup-dotnet@v1
19+
with:
20+
dotnet-version: '6.0.x'
1621

1722
- name: Setup MSBuild Path
1823
uses: microsoft/setup-msbuild@v1
@@ -41,52 +46,71 @@ jobs:
4146
with:
4247
name: Compiled project
4348
path: D:\a\qrcoder\qrcoder
49+
50+
- name: Install .NET 6
51+
uses: actions/setup-dotnet@v1
52+
with:
53+
dotnet-version: '6.0.x'
54+
4455
- name: Run test .NET 3.5
4556
run: dotnet test -c Release -f net35 --nologo --no-build # No coverage for NET3.5 because of bug in combination with Coverlet+Stron naming
57+
4658
- name: Run test .NET 4.52
4759
run: dotnet test -c Release -f net452 --nologo --no-build # No coverage for NET4.5 because of bug in combination with Coverlet+Stron naming
48-
- name: Run test .NET Core 1.3
49-
run: dotnet test -c Release -f netcoreapp1.3 --nologo /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
60+
61+
# Skip 1.3 test due to missing support on Github runner
62+
# - name: Run test .NET Core 1.3
63+
# run: dotnet test -c Release -f netcoreapp1.3 --nologo
64+
5065
- name: Run test .NET Core 2.0
5166
run: dotnet test -c Release -f netcoreapp2.0 --nologo /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
67+
5268
- name: Run test .NET 5.0
5369
run: dotnet test -c Release -f net5.0 --nologo --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
70+
5471
- name: Run test .NET 5.0 Windows
5572
run: dotnet test -c Release -f net5.0-windows --nologo --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
73+
5674
- name: Run test .NET 6.0
5775
run: dotnet test -c Release -f net6.0 --nologo --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
76+
5877
- name: Run test .NET 6.0 Windows
5978
run: dotnet test -c Release -f net6.0-windows --nologo --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
79+
6080
- name: Codecov update netcoreapp2.0
6181
uses: codecov/codecov-action@v2
6282
with:
6383
token: ${{ secrets.CODECOV_TOKEN }}
6484
files: ./QRCoderTests/coverage.netcoreapp2.0.opencover.xml
6585
flags: netcoreapp2.0
86+
6687
- name: Codecov update net5.0
6788
uses: codecov/codecov-action@v2
6889
with:
6990
token: ${{ secrets.CODECOV_TOKEN }}
7091
files: ./QRCoderTests/coverage.net5.0.opencover.xml
7192
flags: net5.0
93+
7294
- name: Codecov update net5.0-windows
7395
uses: codecov/codecov-action@v2
7496
with:
7597
token: ${{ secrets.CODECOV_TOKEN }}
7698
files: ./QRCoderTests/coverage.net5.0-windows.opencover.xml
7799
flags: net5.0-windows
100+
78101
- name: Codecov update net6.0
79102
uses: codecov/codecov-action@v2
80103
with:
81104
token: ${{ secrets.CODECOV_TOKEN }}
82105
files: ./QRCoderTests/coverage.net5.0.opencover.xml
83-
flags: net5.0
106+
flags: net6.0
107+
84108
- name: Codecov update net6.0-windows
85109
uses: codecov/codecov-action@v2
86110
with:
87111
token: ${{ secrets.CODECOV_TOKEN }}
88112
files: ./QRCoderTests/coverage.net5.0-windows.opencover.xml
89-
flags: net5.0-windows
113+
flags: net6.0-windows
90114

91115
pack-push-release:
92116
needs: test
@@ -99,20 +123,33 @@ jobs:
99123
with:
100124
name: Compiled project
101125
path: D:\a\qrcoder\qrcoder
126+
127+
- name: Install .NET 6
128+
uses: actions/setup-dotnet@v1
129+
with:
130+
dotnet-version: '6.0.x'
131+
102132
- name: Restore dependencies
103133
run: dotnet restore
134+
104135
- name: Get assembly version QRCoder
105136
run: echo "ASSEM_VER=$([Reflection.Assembly]::Loadfile( $(-join($pwd,"\QRCoder\bin\Release\net40\QRCoder.dll"))).GetName().version.ToString())" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
137+
106138
- name: Clean assembly version QRCoder
107139
run: echo "ASSEM_VER_SHT=$($env:ASSEM_VER.substring(0, $env:ASSEM_VER.lastIndexOf(".")))" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
140+
108141
- name: Get assembly version QRCoder.Xaml
109142
run: echo "ASSEM_VER_XAML=$([Reflection.Assembly]::Loadfile( $(-join($pwd,"\QRCoder.Xaml\bin\Release\net40\QRCoder.Xaml.dll"))).GetName().version.ToString())" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
143+
110144
- name: Clean assembly version QRCoder.Xaml
111145
run: echo "ASSEM_VER_SHT_XAML=$($env:ASSEM_VER_XAML.substring(0, $env:ASSEM_VER_XAML.lastIndexOf(".")))" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
146+
112147
- name: Build QRCoder NuGet package
113148
run: dotnet pack QRCoder\QRCoder.csproj -c Release --no-build /p:PackageVersion="$env:ASSEM_VER_SHT" /p:PackageReleaseNotes="${{ github.event.inputs.releaseNotes }}"
149+
114150
- name: Build QRCoder.Xaml NuGet package
115151
run: dotnet pack QRCoder.Xaml\QRCoder.Xaml.csproj -c Release --no-build /p:PackageVersion="$env:ASSEM_VER_SHT_XAML" /p:PackageReleaseNotes="${{ github.event.inputs.releaseNotes }}"
152+
116153
- name: Publish QRCoder and QRCoder.Xaml to Github packages
117154
run: dotnet nuget push "**/*.nupkg" --no-symbols --skip-duplicate --api-key $env:GH_PKG_SEC --source https://nuget.pkg.github.com/codebude/index.json
118155

‎.github/workflows/wf-build-test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ jobs:
5757
- name: Run test .NET 4.52
5858
run: dotnet test -c Release -f net452 --nologo --no-build # No coverage for NET4.5 because of bug in combination with Coverlet+Stron naming
5959

60-
- name: Run test .NET Core 1.3
61-
run: dotnet test -c Release -f netcoreapp1.3 --nologo /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
60+
# Skip 1.3 test due to missing support on Github runner
61+
# - name: Run test .NET Core 1.3
62+
# run: dotnet test -c Release -f netcoreapp1.3 --nologo
6263

6364
- name: Run test .NET Core 2.0
6465
run: dotnet test -c Release -f netcoreapp2.0 --nologo /p:CollectCoverage=true /p:CoverletOutputFormat=opencover

0 commit comments

Comments
 (0)