Merge pull request #446 from rsksmart/develop

v2.1.6

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: ci
 
 on:
   push:
-    branches: [ master, develop ]
+    branches: [ main, develop ]
   pull_request:
-    branches: [ master, develop ]
+    branches: [ main, develop ]
 
 jobs:
   test:

.github/workflows/deploy.yml

@@ -1,15 +1,11 @@
 name: RNS build and deploy
 
 on:
-  pull_request:
-    branches:
-      - master
-    types: [closed] 
+  push:
+    branches: [ main ]
 
 jobs:
   testnet_build_and_deploy:
-
-    if: github.event.pull_request.merged == true 
 
     runs-on: ubuntu-latest
 
@@ -44,8 +40,6 @@ jobs:
         aws cloudfront create-invalidation --distribution-id ${{ secrets.TESTNET_CLOUDFRONT_DISTRIBUTION }} --paths "/*"
 
   mainnet_build_and_deploy:
-
-    if: github.event.pull_request.merged == true 
 
     runs-on: ubuntu-latest
 

README.md

@@ -24,7 +24,7 @@
      </a>
 </p>
 
-## Run locally
+## Run for development
 
 Requisites:
 
@@ -37,6 +37,8 @@ Install dependencies:
 yarn
 ```
 
+### Run locally
+
 1. Run a local blockhain:
     - Preferred: [RSK node](https://developers.rsk.co/quick-start/step1-install-rsk-local-node/)
     - Other options: Ganache or Truffle develop
@@ -53,9 +55,9 @@ yarn start
 
 > Connect your browser wallet to local environment using 'Custom RPC' option
 
-## Run on public networks
+### Run locally against public networks
 
-For RSK Mainnet 
+For RSK Mainnet
 
 ```
 yarn start:mainnet
@@ -67,7 +69,7 @@ For RSK Testnet
 yarn start:testnet
 ```
 
-## Run tests
+### Run tests
 
 The testing suite will first install the RNS suite on a local blockchain before running. To make sure this works properly, start Ganache, and set the URL and port in `/tests/setEnvVars.js`.
 
@@ -88,11 +90,15 @@ Update snapshots and run watcher:
 yarn test:watch -u
 ```
 
-## Develop
+### Branching model
+
+- `main` has latest release. Merge into `main` will deploy to S3. Do merge commits.
+- `develop` has latest approved PR. Do squash & merge.
 
-- `master` points to last productive build
-- `develop` points to last approved pull request
-- Other branches are feature branches, based on develop
+PRs:
+- Use branches pointing to latest commit in `develop`
+- Need to pass `ci` and LGTM
+- Will deploy to Github Pages
 
 ## Build
 

yarn.lock

@@ -21980,9 +21980,9 @@ tmp@~0.2.1:
     rimraf "^3.0.0"
 
 [email protected]:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
-  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
+  integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
 
 to-absolute-glob@^0.1.1:
   version "0.1.1"