Skip to content

Commit

Permalink
Bump version and update workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
nlam-atlassian committed Oct 17, 2024
1 parent 24096b1 commit 59d7549
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/publish_ios.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
5 changes: 4 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`).
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies {

allprojects {
group = "com.atlassian.prosemirror"
version = "1.1.0"
version = "1.1.1"
}

val javaVersion = JavaVersion.VERSION_17
Expand Down

0 comments on commit 59d7549

Please sign in to comment.