From 213d0cd56de45a3e35e04a91e08f1b997b19c5bf Mon Sep 17 00:00:00 2001
From: Raneet Debnath <raneetdebnath10@gmail.com>
Date: Mon, 16 Jan 2023 09:11:02 +0530
Subject: [PATCH 1/2] CI: use matic-cli master branch

---
 .github/matic-cli-config.yml | 36 ++++++++++++++++++++++++++++++------
 .github/workflows/ci.yml     |  5 +++--
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/.github/matic-cli-config.yml b/.github/matic-cli-config.yml
index 8bdfe82b3b..d80425d5c4 100644
--- a/.github/matic-cli-config.yml
+++ b/.github/matic-cli-config.yml
@@ -1,11 +1,32 @@
+# defaultStake: 10000
+# defaultFee: 2000
+# borChainId: "15001"
+# heimdallChainId: heimdall-15001
+# contractsBranch: jc/v0.3.1-backport
+# sprintSize: 64
+# blockNumber: '0'
+# blockTime: '2'
+# numOfValidators: 3
+# numOfNonValidators: 0
+# ethURL: http://ganache:9545
+# ethHostUser: ubuntu
+# devnetType: docker
+# borDockerBuildContext: "../../bor"
+# heimdallDockerBuildContext: "https://github.com/maticnetwork/heimdall.git#develop"
+
+
 defaultStake: 10000
 defaultFee: 2000
-borChainId: "15001"
-heimdallChainId: heimdall-15001
-contractsBranch: jc/v0.3.1-backport
-sprintSize: 64
-blockNumber: '0'
-blockTime: '2'
+borChainId: 15001
+heimdallChainId: heimdall-4052
+contractsBranch: 2ed59de3641c407c64def1b40bcd090cb9cc048a
+genesisContractsBranch: master
+sprintSize:
+  - '64'
+blockNumber:
+  - '0'
+blockTime:
+  - '2'
 numOfValidators: 3
 numOfNonValidators: 0
 ethURL: http://ganache:9545
@@ -13,3 +34,6 @@ ethHostUser: ubuntu
 devnetType: docker
 borDockerBuildContext: "../../bor"
 heimdallDockerBuildContext: "https://github.com/maticnetwork/heimdall.git#develop"
+sprintSizeBlockNumber:
+  - '0'
+numOfArchiveNodes: 0
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e9e454c549..d2bd02a202 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,6 +5,7 @@ on:
       - "master"
       - "qa"
       - "develop"
+      - "raneet10/pos-1029"
   pull_request:
     branches:
       - "**"
@@ -104,7 +105,7 @@ jobs:
           uses: actions/checkout@v3
           with:
             repository: maticnetwork/matic-cli
-            ref: arpit/pos-655-2
+            ref: master
             path: matic-cli
 
         - name: Install dependencies on Linux
@@ -119,7 +120,7 @@ jobs:
 
         - uses: actions/setup-node@v3
           with:
-            node-version: '10.17.0'
+            node-version: '16.17.1'
             cache: 'npm'
             cache-dependency-path: |
               matic-cli/package-lock.json

From af5d88247365c9754c73f44a0085ff0fc4bd279f Mon Sep 17 00:00:00 2001
From: Raneet Debnath <raneetdebnath10@gmail.com>
Date: Mon, 16 Jan 2023 10:41:48 +0530
Subject: [PATCH 2/2] trigger ci

---
 .github/matic-cli-config.yml | 19 +------------------
 .github/workflows/ci.yml     |  1 -
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/.github/matic-cli-config.yml b/.github/matic-cli-config.yml
index d80425d5c4..b2182a5204 100644
--- a/.github/matic-cli-config.yml
+++ b/.github/matic-cli-config.yml
@@ -1,24 +1,7 @@
-# defaultStake: 10000
-# defaultFee: 2000
-# borChainId: "15001"
-# heimdallChainId: heimdall-15001
-# contractsBranch: jc/v0.3.1-backport
-# sprintSize: 64
-# blockNumber: '0'
-# blockTime: '2'
-# numOfValidators: 3
-# numOfNonValidators: 0
-# ethURL: http://ganache:9545
-# ethHostUser: ubuntu
-# devnetType: docker
-# borDockerBuildContext: "../../bor"
-# heimdallDockerBuildContext: "https://github.com/maticnetwork/heimdall.git#develop"
-
-
 defaultStake: 10000
 defaultFee: 2000
 borChainId: 15001
-heimdallChainId: heimdall-4052
+heimdallChainId: heimdall-15001
 contractsBranch: 2ed59de3641c407c64def1b40bcd090cb9cc048a
 genesisContractsBranch: master
 sprintSize:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d2bd02a202..8a7ee62bce 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,7 +5,6 @@ on:
       - "master"
       - "qa"
       - "develop"
-      - "raneet10/pos-1029"
   pull_request:
     branches:
       - "**"