Skip to content

Commit

Permalink
Merging changes from master to nightly (#1844)
Browse files Browse the repository at this point in the history
* Link Code of Conduct (#1805)

* Update release checklist (#1808)

* Fix invalid Validate-ImageSize parameter in run-tests script (#1824)

Co-authored-by: Immo Landwerth <immol@microsoft.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
  • Loading branch information
3 people authored Apr 16, 2020
1 parent 1949533 commit f7401cc
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 4 deletions.
16 changes: 13 additions & 3 deletions .github/ISSUE_TEMPLATE/releases/net-core-release.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
# .NET Core Release

## Release Versions

_The set of .NET Core versions that are being released as a unit._

* runtime/SDK

## 1. Master Branch Tasks
1. - [ ] Merge appropriate commits from nightly branch (new/EOL distros, infra changes, etc):
- [ ] &lt;placeholder link&gt;

1. - [ ] Merge appropriate commits from nightly branch. Things to check:
- [ ] New/EOL distro
- [ ] Infrastructure changes
- [ ] PowerShell version
- [ ] Check for additional changes by diffing the master and nightly branches
- [ ] &lt;add link to PR/commit&gt;
1. - [ ] Wait for .NET Core archive files (.zip, .tar.gz) to be available at blob storage location
1. - [ ] Run `update-dependencies` tool to update all the necessary files to reflect the specified .NET Core versions (run this command for each version being released):
- [ ] `dotnet run --project .\eng\update-dependencies\update-dependencies.csproj --sdk-version <sdk> --runtime-version <runtime> --aspnet-version <runtime>`
Expand Down Expand Up @@ -47,11 +53,15 @@ _The set of .NET Core versions that are being released as a unit._
imageBuilder.pathArgs: --path '5.0*'
1. - [ ] Confirm images have been ingested by MCR
1. - [ ] Confirm READMEs have been updated in [Docker Hub](https://hub.docker.com/_/microsoft-dotnet-core)

## 2. Sample Images (Not needed for Preview-only release)

1. - [ ] Confirm build for [dotnet-docker-samples](https://dev.azure.com/dnceng/internal/_build?definitionId=376) (internal MSFT link) was queued. This will be queued automatically by [dotnet-docker-tools-check-base-image-updates](https://dev.azure.com/dnceng/internal/_build?definitionId=536) when it detects that the product images have been updated (detection runs on a schedule). Alternatively, you can manually queue the samples build.
1. - [ ] Confirm sample images have been ingested by MCR
1. - [ ] Confirm README has been updated in Docker Hub for [microsoft-dotnet-core-samples](https://hub.docker.com/_/microsoft-dotnet-core-samples/)

## 2. Nightly Branch Tasks
## 3. Nightly Branch Tasks (Not needed for Preview-only release)

1. - [ ] Merge master branch to nightly
1. - [ ] Run the same `update-dependencies` command(s) in nightly that were run for the master branch
1. - [ ] Inspect generated changes for correctness
Expand Down
6 changes: 6 additions & 0 deletions CODE-OF-CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Code of Conduct

This project has adopted the code of conduct defined by the Contributor Covenant
to clarify expected behavior in our community.

For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
2 changes: 1 addition & 1 deletion tests/run-tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ Try {
Exec "$DotnetInstallDir/dotnet test $testFilter --logger:trx"

if ($TestCategories.Contains('image-size')) {
& ../performance/Validate-ImageSize.ps1 -PullImages:$PullImages -BaselineIntegrityOnly
& ../performance/Validate-ImageSize.ps1 -PullImages:$PullImages -ValidationMode Integrity
}
}
Finally {
Expand Down

0 comments on commit f7401cc

Please sign in to comment.