Skip to content
This repository has been archived by the owner on Oct 3, 2023. It is now read-only.

Commit

Permalink
[#54] Setup auto-merge (#65)
Browse files Browse the repository at this point in the history
* [#54] Setup auto-merge

* disable some ruby versions on ci

* enable ruby 2.4.x on ci

* update ruby versions on ci

* fix ci
  • Loading branch information
jonhue committed Dec 20, 2019
1 parent 01a6102 commit 2c9e14d
Show file tree
Hide file tree
Showing 10 changed files with 102 additions and 31 deletions.
15 changes: 0 additions & 15 deletions .automerge.yml

This file was deleted.

6 changes: 6 additions & 0 deletions .github/auto-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
requiredLabels:
- merge
reportStatus: true
updateBranch: false
deleteBranchAfterMerge: true
mergeMethod: squash
30 changes: 30 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: CI

on: [push]

jobs:
build:

runs-on: ubuntu-latest
strategy:
matrix:
ruby:
- '2.4.x'
- '2.5.x'
- '2.6.x'

name: Ruby ${{ matrix.ruby }}
steps:
- uses: actions/checkout@master
- uses: actions/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
- name: Install dependencies
run: |
sudo apt-get install libsqlite3-dev
gem install bundler
bundle install --jobs 4 --retry 3
- name: Run RuboCop
run: bundle exec rubocop
- name: Run RSpec
run: bundle exec rspec
39 changes: 39 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Release

on:
release:
types: [published]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@master
- uses: actions/setup-ruby@v1
with:
version: 2.6.x

- name: Publish to GPR
run: |
mkdir -p $HOME/.gem
touch $HOME/.gem/credentials
chmod 0600 $HOME/.gem/credentials
printf -- "---\n:github: Bearer ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
gem build *.gemspec
gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
env:
GEM_HOST_API_KEY: ${{secrets.GPR_AUTH_TOKEN}}
OWNER: jonhue

- name: Publish to RubyGems
run: |
mkdir -p $HOME/.gem
touch $HOME/.gem/credentials
chmod 0600 $HOME/.gem/credentials
printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
gem build *.gemspec
gem push *.gem
env:
GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}
1 change: 0 additions & 1 deletion .rspec
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
--require spec_helper
--format documentation
11 changes: 0 additions & 11 deletions .travis.yml

This file was deleted.

13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Changelog

This file tracks all unreleased breaking changes and deprecations on `master`. You can find a list of all releases [here](https://github.com/jonhue/omniauth-paypal-oauth2/releases).

OmniAuth PayPal OAuth2 follows Semantic Versioning 2.0 as defined at http://semver.org.

### Breaking Changes

* None

### Deprecated

* None
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at me@jonhue.me. The project team will review and investigate all complaints, and will respond in a way that it deems 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.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at jonas.huebotter@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems 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.

Expand Down
14 changes: 12 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# OmniAuth PayPal OAuth2 Strategy

[![Gem Version](https://badge.fury.io/rb/omniauth-paypal-oauth2.svg)](https://badge.fury.io/rb/omniauth-paypal-oauth2) ![Travis](https://travis-ci.org/jonhue/omniauth-paypal-oauth2.svg?branch=master)

Strategy to authenticate with PayPal via OmniAuth.

Get your API key at: https://developer.paypal.com/developer/applications/ in the section **RESTApps**. Note the Client ID and the Client Secret.
Expand All @@ -23,6 +21,7 @@ For more details, read the PayPal docs: https://developer.paypal.com/docs/integr
* [Configuration](#configuration)
* [Auth hash](#auth-hash)
* [Testing](#testing)
* [Release](#release)
* [To Do](#to-do)
* [Contributing](#contributing)
* [Semantic versioning](#semantic-versioning)
Expand Down Expand Up @@ -228,6 +227,17 @@ For more details see the PayPal [List Of Attributes](https://developer.paypal.co

---

## Release

1. Review breaking changes and deprecations in `CHANGELOG.md`
2. Change the gem version in `lib/omniauth/paypal_oauth2/version.rb`
3. Reset `CHANGELOG.md`
4. Create a pull request to merge the changes into `master`
5. After the pull request was merged, create a new release listing the breaking changes and commits on `master` since the last release.
6. The release workflow will publish the gems to RubyGems and the GitHub Package Registry

---

## To Do

We use [GitHub projects](https://github.com/jonhue/omniauth-paypal-oauth2/projects/1) to coordinate the work on this project.
Expand Down
2 changes: 1 addition & 1 deletion omniauth-paypal-oauth2.gemspec
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
gem.summary = 'A PayPal OAuth2 strategy for OmniAuth'
gem.description = 'A PayPal OAuth2 strategy for OmniAuth'
gem.authors = 'Jonas Hübotter'
gem.email = 'me@jonhue.me'
gem.email = 'jonas.huebotter@gmail.com'
gem.homepage = 'https://github.com/jonhue/omniauth-paypal-oauth2'
gem.license = 'MIT'

Expand Down

0 comments on commit 2c9e14d

Please sign in to comment.