diff --git a/.github/workflows/release.yml b/.github/workflows/build.yml similarity index 82% rename from .github/workflows/release.yml rename to .github/workflows/build.yml index 962e76ed..c62a3946 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/build.yml @@ -1,9 +1,6 @@ -name: Release +name: Build -on: - push: - branches: - - master +on: push jobs: build: diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml deleted file mode 100644 index 7d38df2b..00000000 --- a/.github/workflows/snapshot.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Snapshot - -on: - push: - branches: - - develop - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v1 - - name: set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: Build with Gradle - run: ./gradlew build diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b77bdebc..00000000 --- a/.travis.yml +++ /dev/null @@ -1,25 +0,0 @@ -# https://docs.travis-ci.com/user/languages/android/ - -language: android - -# so, out of blue travis requires this now (without it build would not even execute, immediate failure when downloading jdk) -dist: trusty -jdk: openjdk8 -sudo: false - -android: - components: - - tools - - platform-tools - - tools - - - build-tools-28.0.3 - - android-28 - -branches: - except: - - gh-pages - -cache: - directories: - - $HOME/.m2 \ No newline at end of file diff --git a/README.md b/README.md index 999f7e8c..d053f8c2 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # Markwon -[![Build Status](https://travis-ci.org/noties/Markwon.svg?branch=master)](https://travis-ci.org/noties/Markwon) +[![Build](https://github.com/noties/Markwon/workflows/Build/badge.svg)](https://github.com/noties/Markwon/actions) **Markwon** is a markdown library for Android. It parses markdown following [commonmark-spec] with the help of amazing [commonmark-java] diff --git a/release-management.md b/release-management.md new file mode 100644 index 00000000..0127d156 --- /dev/null +++ b/release-management.md @@ -0,0 +1,25 @@ +# Release management + +There are 2 core branches: +* `master` +* `develop` + +`master` represents currently released version. In most cases its `HEAD` must also +point to a tag with release version name. + +`develop` represents version that is currently in development. It always should have +`-SNAPSHOT` suffix in `VERSION_NAME` variable (defined in `gradle.properties`). +Ideally each push to `develop` should also publish a SNAPSHOT version to MavenCentral (pending resolution). + +Before releasing a new version a new branch is created. It's name should follow +the `v4.1.1` pattern (where `4.1.1` is upcoming release version name). In this branch +should all release preparations be done (removing all mentions of SNAPSHOT and updating +version name). Then a pull-request is issued from this branch to `master`. + +After a pull-request is resolved (merged to `master`) all changes must be reflected in `develop` +branch (merge with `master`) and `-SNAPSHOT` suffix must be added to the `VERSION_NAME`. + +A new version must be pushed to MavenCentral and new git-tag with version name must be +created in the repository. + +Rinse and repeat. \ No newline at end of file