Updated version & bump (#408)

Signed-off-by: Jake Turner <10009752+Jakeeyturner@users.noreply.github.com>

.mergify.yml

@@ -25,24 +25,4 @@ pull_request_rules:
       merge:
         method: merge
         strict: true
-        strict_method: merge
-  - name: Create v2 PR
-    conditions:
-      - base=master # PR must have been on master
-      - merged # Must have been merged
-      - label!=v2 pr # Ignore v2 prs
-      - label!=ignore-v2 # Add this label to override backport
-    actions:
-      backport:
-        ignore_conflicts: true
-        label_conflicts: conflicts
-        branches:
-          - v2 # Backport to v2 branch
-
-  - name: Add v2 pr label # Add v2 pr label to all PRs for v2 branch
-    conditions:
-      - base=v2
-    actions:
-      label:
-        add:
-           - v2 pr
+        strict_method: merge

azure-pipelines.yml

@@ -106,11 +106,6 @@ stages:
             displayName: Commit version bump
           - script: |
               set -ex
-              if [[ $(Build.SourceBranchName) == v1* ]]; then
-                export branch_name=master
-              else
-                export branch_name=v2
-              fi
-
+              export branch_name=master
               git -c http.extraheader="Authorization: Basic $(GITHUB_BASIC_AUTH)" push $(Build.Repository.Uri) HEAD:$branch_name -f
             displayName: Push commit to GitHub

package.json

@@ -1,6 +1,6 @@
 {
     "name": "generator-fabric",
-    "version": "0.2.24",
+    "version": "0.2.25",
     "description": "Yeoman generator for Hyperledger Fabric",
     "main": "generators/app/index.js",
     "scripts": {