From a570026e8eb30f10194a7324f78a81c7b3af20c7 Mon Sep 17 00:00:00 2001
From: bas080 <bas080@hotmail.com>
Date: Thu, 9 Apr 2026 02:38:15 +0300
Subject: [PATCH] Merge release workflow into publish

---
 .github/workflows/publish.yml | 47 +++++++++++++++++++++++++++++++----
 .github/workflows/release.yml | 45 ---------------------------------
 2 files changed, 42 insertions(+), 50 deletions(-)
 delete mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 77350b7..70e9618 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,4 +1,4 @@
-name: Publish Package
+name: Release and Publish
 
 on:
   push:
@@ -6,20 +6,57 @@ on:
       - '*'
 
 permissions:
+  contents: write
   id-token: write  # Required for OIDC
-  contents: read
 
 jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node: ['lts/*', 'latest']
+      fail-fast: true
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: actions/setup-node@v6
+        with:
+          node-version: ${{ matrix.node }}
+          cache: npm
+
+      - run: npm ci
+      - run: npm test
+
+  release:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: actions/setup-node@v6
+        with:
+          node-version: 'latest'
+          cache: npm
+
+      - run: npm ci
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          generate_release_notes: true
+
   publish:
+    needs: test
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
 
       - uses: actions/setup-node@v6
         with:
-          node-version: '24'
+          node-version: 'latest'
+          cache: npm
           registry-url: 'https://registry.npmjs.org'
+
       - run: npm ci
-      - run: npm run build --if-present
       - run: npm test
-      - run: npm publish
+      - run: npm publish
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index cff49a6..0000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: Release on tag
-
-on:
-  push:
-    tags:
-      - '*'
-
-permissions:
-  contents: write
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node: ['lts/*', 'latest']
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node }}
-          cache: npm
-
-      - run: npm ci
-      - run: npm test
-
-  release:
-    needs: test
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 'latest'
-          cache: npm
-
-      - run: npm ci
-      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v2
-        with:
-          generate_release_notes: true