From 95dbbbcf22939df8cf5efbcb9670f33e0cc4cd45 Mon Sep 17 00:00:00 2001
From: Uruk <uruknarb20@gmail.com>
Date: Sun, 21 Apr 2024 00:53:03 +0200
Subject: [PATCH] Update CI

---
 .github/workflows/merge-conflict-labeler.yml | 9 +++++++--
 .github/workflows/ts-build.yml               | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/merge-conflict-labeler.yml b/.github/workflows/merge-conflict-labeler.yml
index 0ae960c..f4d604c 100644
--- a/.github/workflows/merge-conflict-labeler.yml
+++ b/.github/workflows/merge-conflict-labeler.yml
@@ -1,8 +1,13 @@
 name: Merge Conflict Labeler
 
 on:
+  push:
+    branches:
+      - dev/0.15.0
   pull_request_target:
-    types: [ synchronize ]
+    branches:
+      - dev/0.15.0
+    types: [synchronize]
 
 jobs:
   label:
@@ -10,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'tycrek/ass' }}
     steps:
-      - uses: eps1lon/actions-label-merge-conflict@releases/2.x
+      - uses: eps1lon/actions-label-merge-conflict@v3
         if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}}
         with:
           dirtyLabel: 'merge conflict'
diff --git a/.github/workflows/ts-build.yml b/.github/workflows/ts-build.yml
index 34523d1..de57f75 100644
--- a/.github/workflows/ts-build.yml
+++ b/.github/workflows/ts-build.yml
@@ -20,7 +20,7 @@ jobs:
 
       # Set up Node 20
       - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
 
@@ -44,7 +44,7 @@ jobs:
         
       # Upload archive as an artifact
       - name: Upload archive
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.ARCHIVE_NAME }}
           path: ${{ env.ARCHIVE_NAME }}.zip