From 59d75495c764662bb565593eef4d7c766f80ffb3 Mon Sep 17 00:00:00 2001
From: Nicole Lam <nlam@atlassian.com>
Date: Thu, 17 Oct 2024 11:33:45 +1100
Subject: [PATCH] Bump version and update workflows

---
 .github/workflows/publish.yml     | 4 +---
 .github/workflows/publish_ios.yml | 6 ++----
 CONTRIBUTING.md                   | 5 ++++-
 build.gradle.kts                  | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 2b845c4..b4e3ff1 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -2,9 +2,7 @@ name: Publish to artifactory on release branch
 
 on:
   push:
-    # Sequence of patterns matched against refs/tags
-    tags:
-      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+    branches: [ "release" ]
 
 jobs:
   build:
diff --git a/.github/workflows/publish_ios.yml b/.github/workflows/publish_ios.yml
index dbbd75f..d2a11da 100644
--- a/.github/workflows/publish_ios.yml
+++ b/.github/workflows/publish_ios.yml
@@ -1,10 +1,8 @@
-name: Publish to artifactory on release branch
+name: Create release and upload iOS artifacts
 
 on:
   push:
-    # Sequence of patterns matched against refs/tags
-    tags:
-      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+    branches: [ "release" ]
 
 jobs:
   build:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 19c53f6..a6e2d59 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,4 +21,7 @@ Prior to accepting your contributions we ask that you please follow the appropri
 To create a release, follow these steps:
 1. Update the version in the `build.gradle.kts` file.
 2. Create a PR with these changes, targeting the `main` branch.
-3. Once the PR is merged, create a new tag with the format `v*` e.g. `v1.1.0`. The CI/CD pipeline will create a release and publish it to Artifactory.
+3. Once the PR is merged, create a PR to merge `main` into `release` branch.
+4. Once the 2nd PR is merged, the CI/CD pipeline will create a release, upload iOS assets and publish Android binaries to Artifactory.
+5. Create a new tag with the format `v*` (e.g. `v1.1.0`) on the `release` branch.
+4. Once the release is created, edit the release in the Github UI to add release notes for this release (using `Generate release notes`).
diff --git a/build.gradle.kts b/build.gradle.kts
index b120cd5..24f9ef0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
 
 allprojects {
   group = "com.atlassian.prosemirror"
-  version = "1.1.0"
+  version = "1.1.1"
 }
 
 val javaVersion = JavaVersion.VERSION_17