From 1fb8a0185e50ff532ec78efae5c436daebd36fbe Mon Sep 17 00:00:00 2001
From: Guz013 <43732358+Guz013@users.noreply.github.com>
Date: Fri, 7 Jul 2023 15:35:14 -0300
Subject: [PATCH] =?UTF-8?q?ci:=20=F0=9F=91=B7=20simplified=20release=20bra?=
 =?UTF-8?q?nch=20workflow?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/release-branch.yml | 23 ++++---------------
 .github/workflows/release.yml        | 34 ----------------------------
 2 files changed, 4 insertions(+), 53 deletions(-)
 delete mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release-branch.yml b/.github/workflows/release-branch.yml
index 0380955..8b358a7 100644
--- a/.github/workflows/release-branch.yml
+++ b/.github/workflows/release-branch.yml
@@ -4,11 +4,6 @@ on:
   push:
     branches:
       - dev
-  pull_request:
-    branches:
-      - main
-    types:
-      - closed
 
 concurrency: ${{ github.workflow }}-${{ github.ref }}
 
@@ -38,23 +33,13 @@ jobs:
           branch: main
           commit: 'ci: 👷🦋 version packages'
           title: 🦋 Release branch
+          publish: pnpm run release
         env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  update-dev:
-    if: github.ref_name == 'main' && github.event.pull_request.merged == true && github.event.pull_request.title == '🦋 Release branch'
-    runs-on: ubuntu-latest
-    name: Update dev branch
-    timeout-minutes: 2
-    env:
-      HUSKY: 0
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Release to dev
+      - name: Update dev branch
+        if: steps.changesets.outputs.hasChangesets == 'false'
         uses: devmasx/merge-branch@master
         with:
           type: now
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 5759bdd..0000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: 🎉 Release
-
-on:
-  workflow_run:
-    workflows:
-      - 🧪 Code checking
-    types:
-      - completed
-    branches:
-      - main
-
-jobs:
-  release:
-    if: ${{ github.event.workflow_run.conclusion == 'success' && github.repository == 'loreddev/marknow' }}
-    permissions:
-      contents: write
-      pull-requests: write
-    name: Release
-    env:
-      HUSKY: 0
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Setup environment
-        uses: ./.github/actions/pnpm-setup
-
-      - name: Release packages
-        run: pnpm run release
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}