From 0bfb0976762ba0c71165ec3fad151c2a7653cd90 Mon Sep 17 00:00:00 2001
From: David Marby <david@dmarby.se>
Date: Thu, 10 Mar 2022 18:45:11 +0100
Subject: [PATCH] Fix lerna version bumps and release-recurring skipping, again
 (#4583)

---
 .github/workflows/release-recurring.yml | 4 ++--
 package.json                            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release-recurring.yml b/.github/workflows/release-recurring.yml
index 07519a64e5..440dc474ab 100644
--- a/.github/workflows/release-recurring.yml
+++ b/.github/workflows/release-recurring.yml
@@ -9,8 +9,6 @@ on:
     types:
       - opened
       - synchronize
-    branches-ignore:
-      - 'release/**'
 concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}
       cancel-in-progress: true
@@ -18,6 +16,8 @@ env:
   PR_NUMBER: ${{ github.event.number }}
 jobs:
   build-and-upload-artifacts:
+    # Skip jobs for release PRs
+    if: "!startsWith(github.head_ref, 'release/')"
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
diff --git a/package.json b/package.json
index a0d9b62309..d6a47964f2 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "bootstrap": "npm install && lerna bootstrap && lerna run --stream bootstrap",
     "bootstrap:electron-builder": "lerna bootstrap --no-ci -- --production --no-optional",
     "version": "lerna version",
-    "postversion": "lerna clean --yes && lerna bootstrap --ignore-scripts -- --package-lock-only --no-audit",
+    "postversion": "lerna clean --yes && lerna bootstrap --no-ci --ignore-scripts -- --package-lock-only --no-audit",
     "publish": "lerna publish from-package",
     "clean": "lerna run clean --parallel --stream && lerna clean --yes && rimraf node_modules",
     "test": "lerna run --stream --parallel test",