From 050b0f9c4a5ad4d13f60124b336cfffcc663506e Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Tue, 29 Aug 2023 01:49:12 +0200 Subject: [PATCH] Read EnvVariables using ProviderFactory --- .../src/main/java/io/freefair/gradle/util/GitUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugin-utils/src/main/java/io/freefair/gradle/util/GitUtil.java b/plugin-utils/src/main/java/io/freefair/gradle/util/GitUtil.java index 555618f7..286ffc53 100644 --- a/plugin-utils/src/main/java/io/freefair/gradle/util/GitUtil.java +++ b/plugin-utils/src/main/java/io/freefair/gradle/util/GitUtil.java @@ -31,15 +31,15 @@ public boolean isJenkins(ProviderFactory providerFactory) { public String getSha(Project project) { if (isGithubActions(project.getProviders())) { - return System.getenv("GITHUB_SHA"); + return project.getProviders().environmentVariable("GITHUB_SHA").get(); } if (isTravisCi(project.getProviders())) { - return System.getenv("TRAVIS_COMMIT"); + return project.getProviders().environmentVariable("TRAVIS_COMMIT").get(); } if (isCircleCi(project.getProviders())) { - return System.getenv("CIRCLE_SHA1"); + return project.getProviders().environmentVariable("CIRCLE_SHA1").get(); } return execute(project, "git", "rev-parse", "HEAD"); @@ -47,7 +47,7 @@ public String getSha(Project project) { public String getRef(Project project) { if (isGithubActions(project.getProviders())) { - return System.getenv("GITHUB_REF"); + return project.getProviders().environmentVariable("GITHUB_REF").get(); } return execute(project, "git", "symbolic-ref", "HEAD");