From 6ba1601cb647b0ebaeceb3f7ceb3bbc93bcd2341 Mon Sep 17 00:00:00 2001
From: Jack Tanner <jack@jackandtheblockstalk.com>
Date: Fri, 2 Aug 2024 10:59:32 +0200
Subject: [PATCH 1/2] ci: Test on push and branch protection

---
 .github/workflows/test.yaml | 6 +-----
 .vscode/settings.json       | 8 +++++++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 70a3dbe..2dcea5c 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -1,11 +1,7 @@
 name: Compile all smart contracts
 
 on:
-  pull_request:
-    branches:
-      - master
-      - testnet
-      - development
+  push
       
 jobs:
   compile:
diff --git a/.vscode/settings.json b/.vscode/settings.json
index d8cb326..aef25a8 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,11 @@
 {
     "files.associations": {
         "string": "cpp"
-    }
+    },
+    "git.branchPrefix": "feature/",
+    "git.branchProtection": [
+        "master",
+        "main",
+        "development"
+    ],
 }
\ No newline at end of file

From 6b958b3f74f452a11dfa9d5cce649b6c58749e5c Mon Sep 17 00:00:00 2001
From: Jack Tanner <jack@jackandtheblockstalk.com>
Date: Fri, 2 Aug 2024 11:00:34 +0200
Subject: [PATCH 2/2] feat: update node in docker

---
 blockchain/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/blockchain/Dockerfile b/blockchain/Dockerfile
index 58c148b..26ce633 100644
--- a/blockchain/Dockerfile
+++ b/blockchain/Dockerfile
@@ -33,8 +33,8 @@ RUN bash -c "./nodeos.sh &" && sleep 10 && ./initialize-blockchain.sh && ./nodeo
 ### Install nodejs
 FROM tonomy_blockchain_initialized as tonomy_blockchain_nodejs
 
-RUN wget nodejs.org/dist/v18.12.1/node-v18.12.1-linux-x64.tar.gz
-RUN tar -C /usr/local --strip-components 1 -xzf node-v18.12.1-linux-x64.tar.gz
+RUN wget nodejs.org/dist/v22.3.0/node-v22.3.0-linux-x64.tar.gz
+RUN tar -C /usr/local --strip-components 1 -xzf node-v22.3.0-linux-x64.tar.gz
 
 ### Easy cleos script
 FROM tonomy_blockchain_initialized as tonomy_blockchain_easycleos