From e6b0f398b6292b5fb706b0bdd47295a3b9737a03 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 24 Sep 2021 18:51:40 -0400 Subject: [PATCH] Fix versioning picked up in CI (#291) Fixes ignore blob in versioningHelper --- .github/workflows/main.yml | 2 -- versioningHelper.gradle | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 96dffcb37..52c0d0acf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -216,8 +216,6 @@ jobs: - uses: actions/setup-java@v1 with: java-version: 11 - - run: | - git describe --tags --exclude="Dev" - run: | chmod +x gradlew ./gradlew photon-lib:build --max-workers 1 diff --git a/versioningHelper.gradle b/versioningHelper.gradle index cf1526ff8..1b8bde4e2 100644 --- a/versioningHelper.gradle +++ b/versioningHelper.gradle @@ -8,7 +8,7 @@ gradle.allprojects { String tagIsh try { exec { - commandLine 'git', 'describe', '--tags', '--exclude="Dev"', '--exclude="dev"' + commandLine 'git', 'describe', '--tags', '--exclude="[dD]ev*"' standardOutput = stdout } tagIsh = stdout.toString().trim().toLowerCase()