From 227cb04cddcc7444b8e212289d5f2869d2565e5c Mon Sep 17 00:00:00 2001 From: Tanner Barlow Date: Thu, 6 Jun 2019 18:28:29 -0600 Subject: [PATCH 1/4] ci: Added NPM deployment info to .travis.yml (#158) Fixed compile issue #160 on windows by adding shx npm package to use in build scripts. Also added some local dev instructions to Readme.md Made numbering in local dev instructions in readme.md sequential. Signed Commit Made numbering in local dev sintructions in readme.md sequential. --- .travis.yml | 21 +++++++++++++++------ README.md | 9 +++++++++ package.json | 3 ++- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index e6c0ec47..ba9b137a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,17 +3,26 @@ language: node_js os: linux matrix: - include: - - node_js: '8' - - node_js: '10' + include: + - node_js: '8' + - node_js: '10' sudo: false install: - - npm install - +- npm install script: - npm run test:ci after_success: - - cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage +- cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage + +deploy: + provider: npm + email: $NPM_EMAIL_ACCOUNT + api_key: + secure: Iu5Q2uuiF+jRWkNRtX77YElMwyEopzKD+iHQQkT7HheH12AwDAW/PZiwLRhBTif8kvHmIIwPhjey6i7QwmJFUmpb433299WF+tinRhy5mBFntdaNmgS2Wvv/hOFJza2XdOeIsKA+s+zPAGArfLonmvQX5QKVmJI7/W+hyqJT0FjtTMqxPyJ00ENuDeZdUEcsaoDAwu1XTA6bj5ILnguR+smeGoZscpp8nwTv27fA+GWLFGf08pPAyuHSwc1/lRxSbLlw/f0ZqnCclGU+SF2EV4/9+xxcPWqtJdJfURR/LaOkg3Q5o4aILRjNJNCbpRkrc5lEcPEvBPLrI6e7F9ssg08aHniaMvdD5B9TsgGqV6sxZX/KvMIHWfzBRLuCzY2bPE8Wbw+ZI/yi9+89NZdRikAMyWocvg4tx1OsQRcrRltsXqQrZyw45IR5oSv0kLx54xrslXu8jjP08jQEpnBncJp883DX6DmO42TRP4QYHsQ8BB5hHQ2qmVoKMydkLy0Kdvq7e+9v/pZHEMsR/HOwz1S5xYsSeqwqoq4u/H+hPFWu3GVJXbsVLHZuaDU3fBRMtJOcjujPszrvN/cNt2JryTT1EYPJotmpURqu/n9vPLMzoi1wIKPrZiAcEzh8MLlM93MyG/yuPeHZOvMuwCVtOXd3KKH8sEJvbTVUtKIvQXw= + on: + tags: true + repo: serverless/serverless-azure-functions + branch: master diff --git a/README.md b/README.md index 1535a58a..1e08ca94 100644 --- a/README.md +++ b/README.md @@ -96,6 +96,15 @@ Please create issues in this repo for any problems or questions you find. Before We're still in the process of getting everying running 100%, but please refer to the [Serverless contributing guidlines](https://github.com/serverless/serverless/blob/master/CONTRIBUTING.md) for information on how to contribute and code of conduct. +#### Local dev + +1. Clone this repository to your local machine +2. Navigate to the cloned folder +3. Run `npm install` +4. Run `npm run-script build` +5. Navigate to a folder where you created a new Serverless project, and run `npm link {path to serverless-azure-functions folder}` +6. The npm modules should now contain your local version of this plugin. + ## License [MIT](LICENSE) diff --git a/package.json b/package.json index 47c7dba8..f1b4df98 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "test": "jest", "test:ci": "npm run test -- --ci", "test:coverage": "npm run test -- --coverage", - "prebuild": "rm lib/ -rf", + "prebuild": "shx rm lib/ -rf", "build": "tsc" }, "repository": { @@ -61,6 +61,7 @@ "jest-cli": "^24.8.0", "mock-fs": "^4.10.0", "serverless": "^1.44.1", + "shx": "^0.3.2", "typescript": "^3.4.5" }, "optionalDependencies": { From 912f93f2e42195cdfdb2b36d4b53055244a4c337 Mon Sep 17 00:00:00 2001 From: Hannes Nel Date: Fri, 7 Jun 2019 17:55:38 +1200 Subject: [PATCH 2/4] Fixed compile issue #160 on windows by adding shx npm package to use in build scripts. Also added some local dev instructions to Readme.md --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f1b4df98..c066d170 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "test": "jest", "test:ci": "npm run test -- --ci", "test:coverage": "npm run test -- --coverage", - "prebuild": "shx rm lib/ -rf", + "prebuild": "shx rm -rf lib/ ", "build": "tsc" }, "repository": { @@ -71,4 +71,4 @@ "engines": { "node": ">= 6.5.0" } -} \ No newline at end of file +} From 7e5655c41f693ea689c1500790fc228586563fe2 Mon Sep 17 00:00:00 2001 From: Hannes Nel Date: Wed, 12 Jun 2019 10:00:59 +1000 Subject: [PATCH 3/4] Added information on signing commits to the readme. --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 1e08ca94..d1d123e2 100644 --- a/README.md +++ b/README.md @@ -105,6 +105,16 @@ We're still in the process of getting everying running 100%, but please refer to 5. Navigate to a folder where you created a new Serverless project, and run `npm link {path to serverless-azure-functions folder}` 6. The npm modules should now contain your local version of this plugin. +#### Signing commits + +All commits in your Pull Request will need to be signed. When looking at the commits in the pull request, you will see a green 'verified' icon next to your commit. Commit signature verification is discussed [here](https://help.github.com/en/articles/about-commit-signature-verification) + +Follow the directions [here](https://help.github.com/en/articles/signing-commits) to configure commit signing. + +If any of your commits are not signed, your pull request will not be able to be merged into the base branch. You can fix this by squashing any unsigned commits into signed commits using an interactive rebase, and force pushing your new commit history. More detail [here](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History) + +When using Windows you may also encounter an error when trying to sign a commit, stating that a security key could not be found. Ensure that you have set the path the gpg in the git config: `git config --global gpg.program "C:\Program Files (x86)\GnuPG\bin\gpg.exe"` + ## License [MIT](LICENSE) From 9dc0d8f45593feb35164fb8d36c1ec74040c194a Mon Sep 17 00:00:00 2001 From: Hannes Nel Date: Wed, 12 Jun 2019 10:00:59 +1000 Subject: [PATCH 4/4] Added information on signing commits to the readme. --- README.md | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1e08ca94..f2c0ffd2 100644 --- a/README.md +++ b/README.md @@ -102,8 +102,18 @@ We're still in the process of getting everying running 100%, but please refer to 2. Navigate to the cloned folder 3. Run `npm install` 4. Run `npm run-script build` -5. Navigate to a folder where you created a new Serverless project, and run `npm link {path to serverless-azure-functions folder}` -6. The npm modules should now contain your local version of this plugin. +5. Navigate to a folder where you created a new Serverless project, run `npm install`, and then run `npm link {path to serverless-azure-functions folder}`. Running `npm install` after the link command may override the link. +6. The npm modules should now contain your local version of this plugin. + +#### Signing commits + +All commits in your Pull Request will need to be signed. When looking at the commits in the pull request, you will see a green 'verified' icon next to your commit. Commit signature verification is discussed [here](https://help.github.com/en/articles/about-commit-signature-verification) + +Follow the directions [here](https://help.github.com/en/articles/signing-commits) to configure commit signing. + +If any of your commits are not signed, your pull request will not be able to be merged into the base branch. You can fix this by squashing any unsigned commits into signed commits using an interactive rebase, and force pushing your new commit history. More detail [here](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History) + +When using Windows you may also encounter an error when trying to sign a commit, stating that a security key could not be found. Ensure that you have set the path the gpg in the git config: `git config --global gpg.program "C:\Program Files (x86)\GnuPG\bin\gpg.exe"` ## License