Skip to content

Commit

Permalink
Merge pull request #10 from ifit/adjust-inputs
Browse files Browse the repository at this point in the history
Adjust inputs
  • Loading branch information
dawsontoth authored May 2, 2023
2 parents f2b2758 + 19ee7d3 commit d6b775d
Show file tree
Hide file tree
Showing 9 changed files with 6,874 additions and 2,450 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,4 @@ typings/

# next.js build output
.next
/.idea
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
14
9 changes: 5 additions & 4 deletions example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,19 @@ on:
workflow_dispatch:
schedule:
- cron: '0 7 * * MON' # 1am UTC on monday

jobs:
create_pr:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: actions/setup-node@v1
- uses: actions/setup-node@v3
with:
node-version: '10.x'
node-version: '14.x'
- uses: ifit/ifit-actions/pr-to-master@master
with:
github-api-token: ${{ secrets.GITHUB_API_TOKEN }}
repository-name: ${{ github.repository }}
pr-team-reviewers: 'data-migration-pull-assigner-2'

from-branch: 'test'
to-branch: 'master'
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
"name": "ifit-actions",
"repository": "https://github.com/ifit/ifit-actions",
"private": true,
"scripts": {
"scripts": {
"build-pr-to-master": "ncc build pr-to-master/pr-to-master.ts -o pr-to-master",
"test-pr-to-master": "dotenv node pr-to-master/index.js"
},
"dependencies": {
"@actions/core": "^1.2.6",
"axios": "^0.21.1"
"@actions/core": "^1.10.0",
"axios": "^0.27.2"
},
"devDependencies": {
"@types/node": "^12.12.6",
"@zeit/ncc": "^0.20.5",
"dotenv": "^8.2.0",
"dotenv-cli": "^3.0.0"
"@types/node": "12.12.6",
"@zeit/ncc": "^0.22.3",
"dotenv": "^16.0.3",
"dotenv-cli": "^7.2.1"
}
}
10 changes: 10 additions & 0 deletions pr-to-master/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ To keep things simple, just pass `${{ github.repository }}` from your workflow.

**Optional** Comma separated list of github team names that will be tagged as reviewers

### `from-branch`

**Optional** The base branch that a new release branch will be cut from

### `to-branch`

**Optional** The target branch that the PR will aim to merge into

## Example usage

```
Expand All @@ -30,4 +38,6 @@ with:
github-api-token: ${{ secrets.GITHUB_API_TOKEN }}
repository-name: ${{ github.repository }}
pr-team-reviewers: 'data-migration-pull-assigner-2'
from-branch: 'test'
to-branch: 'master'
```
6 changes: 6 additions & 0 deletions pr-to-master/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ inputs:
pr-team-reviewers:
description: 'Comma seperated list of github teams who will review the PR'
default: ''
from-branch:
description: 'The base branch that a new release branch will be cut from'
default: 'test'
to-branch:
description: 'The target branch that the PR will aim to merge into'
default: 'master'
runs:
using: 'node12'
main: 'index.js'
Loading

0 comments on commit d6b775d

Please sign in to comment.