Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
dustinmoris committed May 28, 2021
2 parents 6c5df57 + d75fad2 commit a3c6d5a
Show file tree
Hide file tree
Showing 15 changed files with 554 additions and 540 deletions.
90 changes: 90 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
name: .NET Core
on:
push:
pull_request:
release:
types:
- published
env:
# Stop wasting time caching packages
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
# Disable sending usage data to Microsoft
DOTNET_CLI_TELEMETRY_OPTOUT: true
# Project name to pack and publish
PROJECT_NAME: Giraffe.TokenRouter
# GitHub Packages Feed settings
GITHUB_FEED: https://nuget.pkg.github.com/giraffe-fsharp/
GITHUB_USER: dustinmoris
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# Official NuGet Feed settings
NUGET_FEED: https://api.nuget.org/v3/index.json
NUGET_KEY: ${{ secrets.NUGET_KEY }}
jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ ubuntu-latest, windows-latest, macos-latest ]
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.100
- name: Restore
run: dotnet restore
- name: Build
run: dotnet build -c Release --no-restore
- name: Test
run: dotnet test -c Release
- name: Pack
if: matrix.os == 'ubuntu-latest'
run: dotnet pack -v normal -c Release --no-restore --include-symbols --include-source -p:PackageVersion=$GITHUB_RUN_ID src/$PROJECT_NAME/$PROJECT_NAME.*proj
- name: Upload Artifact
if: matrix.os == 'ubuntu-latest'
uses: actions/upload-artifact@v2
with:
name: nupkg
path: ./src/${{ env.PROJECT_NAME }}/bin/Release/*.nupkg
prerelease:
needs: build
if: github.ref == 'refs/heads/develop'
runs-on: ubuntu-latest
steps:
- name: Download Artifact
uses: actions/download-artifact@v1
with:
name: nupkg
- name: Push to GitHub Feed
run: |
for f in ./nupkg/*.nupkg
do
curl -vX PUT -u "$GITHUB_USER:$GITHUB_TOKEN" -F package=@$f $GITHUB_FEED
done
deploy:
needs: build
if: github.event_name == 'release'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.100
- name: Create Release NuGet package
run: |
arrTag=(${GITHUB_REF//\// })
VERSION="${arrTag[2]}"
echo Version: $VERSION
VERSION="${VERSION//v}"
echo Clean Version: $VERSION
dotnet pack -v normal -c Release --include-symbols --include-source -p:PackageVersion=$VERSION -o nupkg src/$PROJECT_NAME/$PROJECT_NAME.*proj
- name: Push to GitHub Feed
run: |
for f in ./nupkg/*.nupkg
do
curl -vX PUT -u "$GITHUB_USER:$GITHUB_TOKEN" -F package=@$f $GITHUB_FEED
done
- name: Push to NuGet Feed
run: dotnet nuget push ./nupkg/*.nupkg --source $NUGET_FEED --skip-duplicate --api-key $NUGET_KEY
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -286,3 +286,5 @@ __pycache__/
*.btm.cs
*.odx.cs
*.xsd.cs

.ionide
23 changes: 0 additions & 23 deletions .travis.yml

This file was deleted.

76 changes: 76 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [email protected]. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
56 changes: 56 additions & 0 deletions Giraffe.TokenRouter.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30114.105
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{86ED83A8-3B13-4595-B2F7-CF43BCF5C9C7}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Giraffe.TokenRouter", "src\Giraffe.TokenRouter\Giraffe.TokenRouter.fsproj", "{4E3FE2C0-F63C-4DD8-84A3-83198EE5237D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3EE4079B-6A25-45CC-9AFA-39541D0F985C}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Giraffe.TokenRouter.Tests", "tests\Giraffe.TokenRouter.Tests\Giraffe.TokenRouter.Tests.fsproj", "{34CBC613-DD70-46A3-8AC6-0689510E4147}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4E3FE2C0-F63C-4DD8-84A3-83198EE5237D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4E3FE2C0-F63C-4DD8-84A3-83198EE5237D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4E3FE2C0-F63C-4DD8-84A3-83198EE5237D}.Debug|x64.ActiveCfg = Debug|Any CPU
{4E3FE2C0-F63C-4DD8-84A3-83198EE5237D}.Debug|x64.Build.0 = Debug|Any CPU
{4E3FE2C0-F63C-4DD8-84A3-83198EE5237D}.Debug|x86.ActiveCfg = Debug|Any CPU
{4E3FE2C0-F63C-4DD8-84A3-83198EE5237D}.Debug|x86.Build.0 = Debug|Any CPU
{4E3FE2C0-F63C-4DD8-84A3-83198EE5237D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4E3FE2C0-F63C-4DD8-84A3-83198EE5237D}.Release|Any CPU.Build.0 = Release|Any CPU
{4E3FE2C0-F63C-4DD8-84A3-83198EE5237D}.Release|x64.ActiveCfg = Release|Any CPU
{4E3FE2C0-F63C-4DD8-84A3-83198EE5237D}.Release|x64.Build.0 = Release|Any CPU
{4E3FE2C0-F63C-4DD8-84A3-83198EE5237D}.Release|x86.ActiveCfg = Release|Any CPU
{4E3FE2C0-F63C-4DD8-84A3-83198EE5237D}.Release|x86.Build.0 = Release|Any CPU
{34CBC613-DD70-46A3-8AC6-0689510E4147}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{34CBC613-DD70-46A3-8AC6-0689510E4147}.Debug|Any CPU.Build.0 = Debug|Any CPU
{34CBC613-DD70-46A3-8AC6-0689510E4147}.Debug|x64.ActiveCfg = Debug|Any CPU
{34CBC613-DD70-46A3-8AC6-0689510E4147}.Debug|x64.Build.0 = Debug|Any CPU
{34CBC613-DD70-46A3-8AC6-0689510E4147}.Debug|x86.ActiveCfg = Debug|Any CPU
{34CBC613-DD70-46A3-8AC6-0689510E4147}.Debug|x86.Build.0 = Debug|Any CPU
{34CBC613-DD70-46A3-8AC6-0689510E4147}.Release|Any CPU.ActiveCfg = Release|Any CPU
{34CBC613-DD70-46A3-8AC6-0689510E4147}.Release|Any CPU.Build.0 = Release|Any CPU
{34CBC613-DD70-46A3-8AC6-0689510E4147}.Release|x64.ActiveCfg = Release|Any CPU
{34CBC613-DD70-46A3-8AC6-0689510E4147}.Release|x64.Build.0 = Release|Any CPU
{34CBC613-DD70-46A3-8AC6-0689510E4147}.Release|x86.ActiveCfg = Release|Any CPU
{34CBC613-DD70-46A3-8AC6-0689510E4147}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{4E3FE2C0-F63C-4DD8-84A3-83198EE5237D} = {86ED83A8-3B13-4595-B2F7-CF43BCF5C9C7}
{34CBC613-DD70-46A3-8AC6-0689510E4147} = {3EE4079B-6A25-45CC-9AFA-39541D0F985C}
EndGlobalSection
EndGlobal
26 changes: 0 additions & 26 deletions appveyor.yml

This file was deleted.

Loading

0 comments on commit a3c6d5a

Please sign in to comment.