From 518e9f63b3823e242be575bf9e634df239c9277a Mon Sep 17 00:00:00 2001 From: Michael Mior Date: Thu, 22 Aug 2024 09:27:01 -0400 Subject: [PATCH] Use consistent ordering of CI tool environment variables --- plugin/src/main/scala/com/geirsson/CiReleasePlugin.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugin/src/main/scala/com/geirsson/CiReleasePlugin.scala b/plugin/src/main/scala/com/geirsson/CiReleasePlugin.scala index c6a5eb0..5837796 100644 --- a/plugin/src/main/scala/com/geirsson/CiReleasePlugin.scala +++ b/plugin/src/main/scala/com/geirsson/CiReleasePlugin.scala @@ -42,17 +42,17 @@ object CiReleasePlugin extends AutoPlugin { .exists(_.startsWith("refs/tags")) def releaseTag: String = Option(System.getenv("TRAVIS_TAG")) - .orElse(Option(System.getenv("BUILD_SOURCEBRANCH"))) - .orElse(Option(System.getenv("GITHUB_REF"))) .orElse(Option(System.getenv("CIRCLE_TAG"))) .orElse(Option(System.getenv("CI_COMMIT_TAG"))) + .orElse(Option(System.getenv("BUILD_SOURCEBRANCH"))) + .orElse(Option(System.getenv("GITHUB_REF"))) .getOrElse("") def currentBranch: String = Option(System.getenv("TRAVIS_BRANCH")) - .orElse(Option(System.getenv("BUILD_SOURCEBRANCH"))) - .orElse(Option(System.getenv("GITHUB_REF"))) .orElse(Option(System.getenv("CIRCLE_BRANCH"))) .orElse(Option(System.getenv("CI_COMMIT_BRANCH"))) + .orElse(Option(System.getenv("BUILD_SOURCEBRANCH"))) + .orElse(Option(System.getenv("GITHUB_REF"))) .getOrElse("") @deprecated("Deprecated, please use isSecure", "1.4.32")