Merge branch 'release/1.1.4'

CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
+## [1.1.4] - 2020-06-18
+### Added
+* Add "functions-dir" input to deploy Netlify Functions [#191](https://github.com/nwtgck/actions-netlify/pull/191) by [@fmr](https://github.com/fmr)
+
 ## [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)
@@ -111,7 +115,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.3...HEAD
+[Unreleased]: https://github.com/nwtgck/actions-netlify/compare/v1.1.4...HEAD
+[1.1.4]: https://github.com/nwtgck/actions-netlify/compare/v1.1.3...v1.1.4
 [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

README.md

@@ -41,6 +41,7 @@ jobs:
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
+        timeout-minutes: 1
 ```
 
 
@@ -59,6 +60,7 @@ jobs:
 - `enable-commit-comment: true` Comment on GitHub commit (default: true)
 - `overwrites-pull-request-comment: true` Overwrites comment on pull request (default: true)
 - `netlify-config-path: ./netlify.toml` Path to `netlify.toml` (default: undefined)
+- `functions-dir` Netlify functions output directory (default: undefined)
 - `alias` Specifies the prefix for the deployment URL (default: Netlify build ID)
   - `alias: ${{ github.head_ref }}` replicates the [branch deploy prefix](https://docs.netlify.com/site-deploys/overview/#definitions)
   - `alias: deploy-preview-${{ github.event.number }}` replicates the [deploy preview prefix](https://docs.netlify.com/site-deploys/overview/#definitions)

__tests__/main.test.ts

@@ -31,6 +31,20 @@ describe('defaultInputs', () => {
     })
   })
 
+  describe('functionsDir', () => {
+    test('it should be a string when specified', () => {
+      withInput('functions-dir', './my_functions_dir', () => {
+        const functionsDir: string | undefined = defaultInputs.functionsDir()
+        expect(functionsDir).toBe('./my_functions_dir')
+      })
+    })
+
+    test('it should be undefined when not specified', () => {
+      const functionsDir: string | undefined = defaultInputs.functionsDir()
+      expect(functionsDir).toBe(undefined)
+    })
+  })
+
   describe('deployMessage', () => {
     test('it should be a string when specified', () => {
       withInput('deploy-message', 'Deploy with GitHub Actions', () => {