Skip to content

update build config, bump package version and document process #392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .github/CONTRIBUTING.MD
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,29 @@ I have chosen to loosely follow the [Angular Commit Guidelines](https://github.c
# Documentation

If you'd like to help us improve our documentation, please checkout our [GitHub pages repository](https://github.com/json-api-dotnet/json-api-dotnet.github.io) where we host our documentation.

# Backporting Features To Prior Releases

To backport a feature that has been approved and merged into `master`:

## Requester

Open an issue requesting the feature you would like backported. The change will be reviewed based on:

- compatibility
- difficulty in porting the change
- the added value the feature provides for users on the older versions
- how difficult it is for users to migrate from the older version to the newer version

## Maintainer

- Checkout the version you want to apply the feature on top of and create a new branch to release the new version:
```
git checkout tags/v2.5.1 -b release/2.5.2
```
- Cherrypick the merge commit: `git cherry-pick {git commit SHA}`
- Bump the package version in the csproj
- Make any other compatibility, documentation or tooling related changes
- Push the branch to origin and verify the build
- Once the build is verified, create a GitHub release, tagging the release branch
- Open a PR back to master with any other additions
13 changes: 13 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ branches:
- master
- develop
- unstable
- /release\/.+/

nuget:
disable_publish_on_pr: true
Expand All @@ -38,6 +39,7 @@ test: off
artifacts:
- path: .\**\artifacts\**\*.nupkg
name: NuGet

deploy:
- provider: NuGet
server: https://www.myget.org/F/research-institute/api/v2/package
Expand All @@ -47,17 +49,28 @@ deploy:
symbol_server: https://www.myget.org/F/research-institute/symbols/api/v2/package
on:
branch: develop

- provider: NuGet
server: https://www.myget.org/F/jadnc/api/v2/package
api_key:
secure: 6CeYcZ4Ze+57gxfeuHzqP6ldbUkPtF6pfpVM1Gw/K2jExFrAz763gNAQ++tiacq3
skip_symbols: false
on:
branch: unstable

- provider: NuGet
name: production
skip_symbols: false
api_key:
secure: /fsEOgG4EdtNd6DPmko9h3NxQwx1IGDcFreGTKd2KA56U2KEkpX/L/pCGpCIEf2s
on:
branch: master
appveyor_repo_tag: true

- provider: NuGet
skip_symbols: false
api_key:
secure: /fsEOgG4EdtNd6DPmko9h3NxQwx1IGDcFreGTKd2KA56U2KEkpX/L/pCGpCIEf2s
on:
branch: /release\/.+/
appveyor_repo_tag: true