From 9eb9d1cd510c813022c9424f077f4d16b9c0aad5 Mon Sep 17 00:00:00 2001
From: Nikita Elfimov <nelfimov@mail.ru>
Date: Mon, 9 Sep 2024 13:13:46 +0300
Subject: [PATCH] feat(github-publish): bump version immediately on publish

---
 .github/workflows/checks.yaml  | 12 ++----------
 .github/workflows/publish.yaml | 12 ++++++++++--
 .github/workflows/version.yaml | 13 -------------
 3 files changed, 12 insertions(+), 25 deletions(-)
 delete mode 100644 .github/workflows/version.yaml

diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
index dfa9b2cd..89998984 100644
--- a/.github/workflows/checks.yaml
+++ b/.github/workflows/checks.yaml
@@ -1,17 +1,9 @@
 name: Checks
 
-on: [pull_request]
+on:
+  pull_request:
 
 jobs:
   check:
-    name: Typecheck, lint
     uses: atls/shared/.github/workflows/checks.yaml@master
     permissions: write-all
-  release:
-    name: Release
-    uses: atls/shared/.github/workflows/release.yaml@master
-    permissions: write-all
-  test:
-    name: Tests
-    uses: atls/shared/.github/workflows/tests.yaml@master
-    permissions: write-all
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 4b623d64..2d4f9ab0 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -1,11 +1,19 @@
 name: Publish
 
 on:
-  workflow_dispatch:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - master
+    paths-ignore:
+      - '.github/**'
 
 jobs:
-  run:
+  publish:
+    if: github.event.pull_request.merged == true
     name: Publish
     uses: atls/shared/.github/workflows/publish.yaml@master
+    permissions: write-all
     secrets:
       npmAuthToken: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/version.yaml b/.github/workflows/version.yaml
deleted file mode 100644
index eda68928..00000000
--- a/.github/workflows/version.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: Version
-
-on:
-  pull_request:
-    types: [closed]
-    branches:
-      - master
-
-jobs:
-  Run:
-    name: Version
-    uses: atls/shared/.github/workflows/version.yaml@master
-    permissions: write-all