From 25ab1f00246264a1646e93688954316d37111dc4 Mon Sep 17 00:00:00 2001
From: Altynbek Orumbayev <aorumbayev@protonmail.com>
Date: Tue, 27 Aug 2024 01:44:08 +0300
Subject: [PATCH] chore: patching ci

---
 .github/workflows/cicd.yaml         | 8 ++++----
 .github/workflows/prod_release.yaml | 4 ++--
 package.json                        | 3 ---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml
index f9b4484..da7ce7c 100644
--- a/.github/workflows/cicd.yaml
+++ b/.github/workflows/cicd.yaml
@@ -32,7 +32,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           scope: "@subtopia-algo"
           cache: "pnpm"
           cache-dependency-path: ./pnpm-lock.yaml
@@ -60,7 +60,7 @@ jobs:
           ssh-key: ${{ secrets.PRIVATE_SSH_KEY }}
           repository: subtopia-algo/subtopia-contracts
           path: ./registry-infra
-          node-version: 18
+          node-version: 20
           python-version: ">=3.11 <3.12"
           poetry-version: 1.7.1
 
@@ -107,7 +107,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           scope: "@subtopia-algo"
           cache: "npm"
           cache-dependency-path: ./package-lock.json
@@ -144,7 +144,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           scope: "@subtopia-algo"
           cache: "pnpm"
           cache-dependency-path: ./pnpm-lock.yaml
diff --git a/.github/workflows/prod_release.yaml b/.github/workflows/prod_release.yaml
index f793f08..85480c9 100644
--- a/.github/workflows/prod_release.yaml
+++ b/.github/workflows/prod_release.yaml
@@ -15,14 +15,14 @@ jobs:
         with:
           fetch-depth: 0
       - name: Merge main -> release
-        uses: devmasx/merge-branch@6ec8363d74aad4f1615d1234ae1908b4185c4313
+        uses: devmasx/merge-branch@master
         with:
           type: now
           from_branch: main
           target_branch: release
           github_token: ${{ secrets.GITHUB_TOKEN }}
       - name: Merge release -> main
-        uses: devmasx/merge-branch@6ec8363d74aad4f1615d1234ae1908b4185c4313
+        uses: devmasx/merge-branch@master
         with:
           type: now
           from_branch: release
diff --git a/package.json b/package.json
index 5551772..f189d26 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,6 @@
         }
       ],
       "@semantic-release/release-notes-generator",
-      "@feki.de/semantic-release-yarn",
       "@semantic-release/github"
     ],
     "branches": [
@@ -102,12 +101,10 @@
     ],
     "verifyConditions": [
       "@semantic-release/changelog",
-      "@feki.de/semantic-release-yarn",
       "@semantic-release/git"
     ],
     "prepare": [
       "@semantic-release/changelog",
-      "@feki.de/semantic-release-yarn",
       "@semantic-release/git"
     ]
   },