Update CI

tycrek · Apr 20, 2024 · 95dbbbc · 95dbbbc
1 parent 162a20f
commit 95dbbbc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/merge-conflict-labeler.yml b/.github/workflows/merge-conflict-labeler.yml
@@ -1,16 +1,21 @@
 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:
     name: 'Merge conflict labeling'
     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
@@ -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