Merge pull request #156 from SpineEventEngine/increment-version-check

Increment version check

Author: dmdashenkov

.github/workflows/increment_guard.yml

@@ -0,0 +1,26 @@
+# Ensures that the current lib version is not yet published but executing the Gradle
+# `checkVersionIncrement` task.
+
+name: Check version increment
+
+on:
+  push:
+    branches: '**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Pull config
+        run: git submodule update --init --recursive
+
+      - name: Check version is not yet published
+        shell: bash
+        run: ./gradlew checkVersionIncrement

build.gradle.kts

@@ -20,7 +20,6 @@
 
 import io.spine.gradle.internal.DependencyResolution
 import io.spine.gradle.internal.Deps
-import io.spine.gradle.internal.IncrementGuard
 import io.spine.gradle.internal.PublishingRepos
 
 buildscript {
@@ -211,5 +210,4 @@ apply {
     from(Deps.scripts.publish(project))
     from(Deps.scripts.repoLicenseReport(project))
     from(Deps.scripts.generatePom(project))
-    plugin(IncrementGuard::class)
 }

buildSrc/src/main/kotlin/io/spine/gradle/internal/IncrementGuard.kt

@@ -39,8 +39,8 @@ class IncrementGuard : Plugin<Project> {
      *
      * Only adds the check if the project is built on Travis CI and the job is a pull request.
      *
-     * The task will never run outside of Travis CI or when building individual branches. This is
-     * done to prevent unexpected CI fails when re-building `master` multiple times, creating git
+     * The task only runs on non-master branches on GitHub Actions. This is done
+     * to prevent unexpected CI fails when re-building `master` multiple times, creating git
      * tags, and in other cases that go outside of the "usual" development cycle.
      */
     override fun apply(target: Project) {
@@ -50,25 +50,33 @@ class IncrementGuard : Plugin<Project> {
             tasks.getByName("check").dependsOn(this)
 
             shouldRunAfter("test")
-            if (!isTravisPullRequest()) {
-                logger.info("The build does not represent a Travis pull request job, the " +
-                        "`checkVersionIncrement` task is disabled.")
+            if (!shouldCheckVersion()) {
+                logger.info("The build does not represent a GitHub Actions feature branch job, " +
+                        "the `checkVersionIncrement` task is disabled.")
                 this.enabled = false
             }
         }
     }
 
     /**
-     * Returns `true` if the current build is a Travis job which represents a GitHub pull request.
+     * Returns `true` if the current build is a GitHub Actions build which represents a push
+     * to a feature branch.
      *
-     * Implementation note: the `TRAVIS_PULL_REQUEST` environment variable contains the pull
-     * request number rather than `"true"` in positive case, hence the check.
+     * Returns `false` if the associated reference is not a branch (e.g. a tag) or if it has
+     * the name which ends with `master`. So, on branches such as `master` and `2.x-jdk8-master`
+     * this method would return `false`.
      *
-     * @see <a href="https://docs.travis-ci.com/user/environment-variables/#default-environment-variables">
-     *     List of default environment variables provided for Travis builds</a>
+     * @see <a href="https://docs.github.com/en/free-pro-team@latest/actions/reference/environment-variables">
+     *     List of default environment variables provided for GitHub Actions builds</a>
      */
-    private fun isTravisPullRequest(): Boolean {
-        val isPullRequest = System.getenv("TRAVIS_PULL_REQUEST")
-        return isPullRequest != null && isPullRequest != "false"
+    private fun shouldCheckVersion(): Boolean {
+        val eventName = System.getenv("GITHUB_EVENT_NAME")
+        if ("push" != eventName) {
+            return false
+        }
+        val reference = System.getenv("GITHUB_REF") ?: return false
+        val matches = Regex("refs/heads/(.+)").matchEntire(reference) ?: return false
+        val branch = matches.groupValues[1]
+        return !branch.endsWith("master")
     }
 }

config

@@ -19,11 +19,14 @@
  */
 
 import com.github.psxpaul.task.ExecFork
+import io.spine.gradle.internal.IncrementGuard
 
 plugins {
     id("com.github.psxpaul.execfork").version("0.1.13")
 }
 
+apply<IncrementGuard>()
+
 val spineCoreVersion: String by extra
 
 dependencies {

datastore/build.gradle.kts

@@ -588,7 +588,7 @@
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Fri Nov 20 16:49:35 EET 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Mon Nov 23 15:05:20 EET 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
@@ -1005,7 +1005,7 @@ This report was generated on **Fri Nov 20 16:49:35 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Fri Nov 20 16:49:50 EET 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Mon Nov 23 15:05:25 EET 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
@@ -1596,7 +1596,7 @@ This report was generated on **Fri Nov 20 16:49:50 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Fri Nov 20 16:50:09 EET 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Mon Nov 23 15:05:32 EET 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
@@ -2189,4 +2189,4 @@ This report was generated on **Fri Nov 20 16:50:09 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Fri Nov 20 16:50:22 EET 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Mon Nov 23 15:05:35 EET 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).

license-report.md

@@ -25,6 +25,6 @@
  * `.config/gradle/dependencies.gradle`.
  */
 
-val spineBaseVersion: String by extra("1.6.12")
-val spineCoreVersion: String by extra("1.6.13")
-val versionToPublish: String by extra("1.6.12")
+val spineBaseVersion: String by extra("1.6.13")
+val spineCoreVersion: String by extra("1.6.15")
+val versionToPublish: String by extra("1.6.15")