Skip to content

Commit

Permalink
Merge branch 'release/1.1.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
nwtgck committed Jun 13, 2020
2 parents 75185d2 + 812545b commit a15fb09
Show file tree
Hide file tree
Showing 12 changed files with 179,102 additions and 181,871 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,8 @@ Thumbs.db

# Ignore built ts files
__tests__/runner/*
lib/**/*
lib/**/*

# Intellij

.idea/
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)

## [Unreleased]

## [1.1.3] - 2020-06-13
### Added
* Add "production-deploy" input to deploy as Netlify production deploy [#188](https://github.com/nwtgck/actions-netlify/pull/188) by [@gvdp](https://github.com/gvdp)

## [1.1.2] - 2020-06-13
### Added
* Add "alias" input to deploy with alias [#178](https://github.com/nwtgck/actions-netlify/pull/178) by [@rajington](https://github.com/rajington)
Expand Down Expand Up @@ -107,7 +111,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
* Deploy to Netlify
* Comment on GitHub PR

[Unreleased]: https://github.com/nwtgck/actions-netlify/compare/v1.1.2...HEAD
[Unreleased]: https://github.com/nwtgck/actions-netlify/compare/v1.1.3...HEAD
[1.1.3]: https://github.com/nwtgck/actions-netlify/compare/v1.1.2...v1.1.3
[1.1.2]: https://github.com/nwtgck/actions-netlify/compare/v1.1.1...v1.1.2
[1.1.1]: https://github.com/nwtgck/actions-netlify/compare/v1.1.0...v1.1.1
[1.1.0]: https://github.com/nwtgck/actions-netlify/compare/v1.0.13...v1.1.0
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ jobs:

### Optional inputs
- `production-branch` (e.g. "master")
- `production-deploy`: Deploy as Netlify production deploy (default: false)
- `github-token: ${{ secrets.GITHUB_TOKEN }}`
- `deploy-message` A custom deploy message to see on Netlify deployment (e.g. `${{ github.event.pull_request.title }}`)
- `enable-pull-request-comment: true` Comment on pull request (default: true)
Expand Down
23 changes: 22 additions & 1 deletion __tests__/main.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ describe('defaultInputs', () => {
})
})

test('it should be true when "false" specified', () => {
test('it should be false when "false" specified', () => {
withInput('overwrites-pull-request-comment', 'false', () => {
const b: boolean = defaultInputs.overwritesPullRequestComment()
expect(b).toBe(false)
Expand All @@ -146,6 +146,27 @@ describe('defaultInputs', () => {
})
})
})

describe('production deploy', () => {
test('it should be default value (false) when not specified', () => {
const b: boolean = defaultInputs.productionDeploy()
expect(b).toBe(false)
})

test('it should be true when "true" specified', () => {
withInput('production-deploy', 'true', () => {
const b: boolean = defaultInputs.productionDeploy()
expect(b).toBe(true)
})
})

test('it should be false when "false" specified', () => {
withInput('production-deploy', 'false', () => {
const b: boolean = defaultInputs.productionDeploy()
expect(b).toBe(false)
})
})
})
})

// Old tests below
Expand Down
Loading

4 comments on commit a15fb09

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.