amqp-delegate
Advanced tools
Comparing version 1.3.0 to 1.3.1
@@ -19,3 +19,3 @@ # How to contribute to this project | ||
4. Disallow direct pushing to upstream `git remote set-url --push upstream no_push` | ||
5. create a local `master` branch `git checkout -b master` and test it via `git pull upstream master` | ||
5. create a local `main` branch `git checkout -b main` and test it via `git pull upstream main` | ||
6. ensure you have installed the [`git-flow` command line helpers](https://github.com/nvie/gitflow) and [`git-flow-completion` utils](https://github.com/bobthecow/git-flow-completion) then run `git flow init -d`. | ||
@@ -50,3 +50,3 @@ | ||
It's basically the same process but use the word `hotfix` or `support` instead of `feature`. `git flow` knows what to do. Just keep in mind that any changes are going to happen to your fork, and not the upstream repo. If you need to merge a `hotfix` into upstream master you may only do it va a reviewed pull request. | ||
It's basically the same process but use the word `hotfix` or `support` instead of `feature`. `git flow` knows what to do. Just keep in mind that any changes are going to happen to your fork, and not the upstream repo. If you need to merge a `hotfix` into upstream main you may only do it va a reviewed pull request. | ||
@@ -57,5 +57,5 @@ ### Releasing to production | ||
2. commit any changes to version info in `package.json` then `git flow release publish {tag.number}` | ||
3. `git flow release finish {tag.number}` merges the release into `master` of your fork, tags it, merges that back into `develop` on your fork and removes the release branch. | ||
4. Now go back to GitHub and raise a Pull Request to merge the upstream master from your fork's `master` branch. When that goes through you are done. | ||
5. In your command-line go back and clean up any outstanding branches and `git pull upstream` your local `master` and `develop` branches to ensure everything on your local machine is up to date with everyone's changes. | ||
3. `git flow release finish {tag.number}` merges the release into `main` of your fork, tags it, merges that back into `develop` on your fork and removes the release branch. | ||
4. Now go back to GitHub and raise a Pull Request to merge the upstream main from your fork's `main` branch. When that goes through you are done. | ||
5. In your command-line go back and clean up any outstanding branches and `git pull upstream` your local `main` and `develop` branches to ensure everything on your local machine is up to date with everyone's changes. | ||
@@ -62,0 +62,0 @@ Note you will **never** push changes directly to the upstream project, _only to your own fork_. |
{ | ||
"name": "amqp-delegate", | ||
"version": "1.3.0", | ||
"version": "1.3.1", | ||
"description": "A remote worker system that uses AMQP to coordinate jobs.", | ||
@@ -51,3 +51,3 @@ "author": "Dave Sag <davesag@gmail.com>", | ||
"dependencies": { | ||
"amqplib": "^0.8.0", | ||
"amqplib": "^0.10.0", | ||
"uuid": "^8.3.1" | ||
@@ -57,21 +57,22 @@ }, | ||
"ajv": "^8.1.0", | ||
"chai": "^4.2.0", | ||
"chai": "^4.3.6", | ||
"chai-as-promised": "^7.1.1", | ||
"eslint": "^7.11.0", | ||
"eslint-config-prettier": "^8.0.0", | ||
"eslint-config-standard": "^16.0.2", | ||
"eslint-plugin-mocha": "^8.0.0", | ||
"eslint": "^8.20.0", | ||
"eslint-config-prettier": "^8.5.0", | ||
"eslint-config-standard": "^17.0.0", | ||
"eslint-plugin-import": "^2.26.0", | ||
"eslint-plugin-mocha": "^10.1.0", | ||
"eslint-plugin-node": "^11.1.0", | ||
"eslint-plugin-prettier": "^3.1.4", | ||
"faker": "^5.1.0", | ||
"husky": "^6.0.0", | ||
"lint-staged": "^11.0.0", | ||
"mocha": "^8.2.0", | ||
"eslint-plugin-prettier": "^4.2.1", | ||
"eslint-plugin-promise": "^6.0.0", | ||
"husky": "^8.0.1", | ||
"lint-staged": "^13.0.3", | ||
"mocha": "^10.0.0", | ||
"nyc": "^15.1.0", | ||
"prettier": "^2.1.2", | ||
"prettier": "^2.7.1", | ||
"proxyquire": "^2.1.3", | ||
"sinon": "^10.0.0", | ||
"sinon": "^14.0.0", | ||
"sinon-chai": "^3.5.0", | ||
"snyk": "^1.419.1", | ||
"supertest": "^6.0.0", | ||
"snyk": "^1.981.0", | ||
"supertest": "^6.2.4", | ||
"wait-until": "0.0.2" | ||
@@ -78,0 +79,0 @@ }, |
@@ -125,3 +125,3 @@ # amqp-delegate | ||
| `develop` | [![CircleCI](https://circleci.com/gh/davesag/amqp-delegate/tree/develop.svg?style=svg)](https://circleci.com/gh/davesag/amqp-delegate/tree/develop) | [![codecov](https://codecov.io/gh/davesag/amqp-delegate/branch/develop/graph/badge.svg)](https://codecov.io/gh/davesag/amqp-delegate) | [![Vulnerabilities](https://snyk.io/test/github/davesag/amqp-delegate/develop/badge.svg)](https://snyk.io/test/github/davesag/amqp-delegate/develop) | Work in progress | | ||
| `master` | [![CircleCI](https://circleci.com/gh/davesag/amqp-delegate/tree/master.svg?style=svg)](https://circleci.com/gh/davesag/amqp-delegate/tree/master) | [![codecov](https://codecov.io/gh/davesag/amqp-delegate/branch/master/graph/badge.svg)](https://codecov.io/gh/davesag/amqp-delegate) | [![Vulnerabilities](https://snyk.io/test/github/davesag/amqp-delegate/master/badge.svg)](https://snyk.io/test/github/davesag/amqp-delegate/master) | Latest stable release | | ||
| `main` | [![CircleCI](https://circleci.com/gh/davesag/amqp-delegate/tree/main.svg?style=svg)](https://circleci.com/gh/davesag/amqp-delegate/tree/main) | [![codecov](https://codecov.io/gh/davesag/amqp-delegate/branch/main/graph/badge.svg)](https://codecov.io/gh/davesag/amqp-delegate) | [![Vulnerabilities](https://snyk.io/test/github/davesag/amqp-delegate/main/badge.svg)](https://snyk.io/test/github/davesag/amqp-delegate/main) | Latest stable release | | ||
@@ -139,3 +139,3 @@ ### Prerequisites | ||
### To Start the queue server for integration testing. | ||
### To Start the queue server for integration testing | ||
@@ -142,0 +142,0 @@ ```sh |
22604
22
+ Added@acuminous/bitsyntax@0.1.2(transitive)
+ Addedamqplib@0.10.5(transitive)
+ Addeddebug@4.4.0(transitive)
+ Addedms@2.1.3(transitive)
- Removedamqplib@0.8.0(transitive)
- Removedbitsyntax@0.1.0(transitive)
- Removedbluebird@3.7.2(transitive)
- Removedcore-util-is@1.0.3(transitive)
- Removeddebug@2.6.9(transitive)
- Removedinherits@2.0.4(transitive)
- Removedisarray@0.0.1(transitive)
- Removedms@2.0.0(transitive)
- Removedreadable-stream@1.1.14(transitive)
- Removedsafe-buffer@5.2.1(transitive)
- Removedstring_decoder@0.10.31(transitive)
Updatedamqplib@^0.10.0