From 03625bb6c20539e5cbfb6ed6a13abe3f4b888a9e Mon Sep 17 00:00:00 2001 From: Hannam Rhee Date: Tue, 25 Jul 2023 14:34:06 +0900 Subject: [PATCH 1/2] use environment variable directly --- .github/workflows/actions_build.yml | 3 ++- settings.gradle | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml index 44ffb3331bd..a60c64fe98d 100644 --- a/.github/workflows/actions_build.yml +++ b/.github/workflows/actions_build.yml @@ -18,7 +18,8 @@ concurrency: env: LC_ALL: "en_US.UTF-8" BUILD_JDK_VERSION: "19" - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} + PRIVATE_GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} + PUBLIC_GRADLE_ENTERPRISE_ACCESS_KEY: "scr6znfepfdcwgczcbybz22tb44yae7xgjxorl32vtrlojl6x37q" jobs: build: diff --git a/settings.gradle b/settings.gradle index a6e1a4d2f8e..7d2cb14a895 100644 --- a/settings.gradle +++ b/settings.gradle @@ -21,6 +21,9 @@ gradleEnterprise { taskInputFiles = true } } + accessKey = System.getenv("PRIVATE_GRADLE_ENTERPRISE_ACCESS_KEY") != null + ? System.getenv("PRIVATE_GRADLE_ENTERPRISE_ACCESS_KEY") + : System.getenv("PUBLIC_GRADLE_ENTERPRISE_ACCESS_KEY") } rootProject.name = 'armeria' From 1772752dc934400fb80fd0ac6232479fb28124d2 Mon Sep 17 00:00:00 2001 From: Hannam Rhee Date: Tue, 1 Aug 2023 00:17:45 +0900 Subject: [PATCH 2/2] add empty check --- settings.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 7d2cb14a895..cfda5e5d32e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -21,7 +21,8 @@ gradleEnterprise { taskInputFiles = true } } - accessKey = System.getenv("PRIVATE_GRADLE_ENTERPRISE_ACCESS_KEY") != null + def privateKey = System.getenv("PRIVATE_GRADLE_ENTERPRISE_ACCESS_KEY") + accessKey = privateKey != null && !privateKey.isEmpty() ? System.getenv("PRIVATE_GRADLE_ENTERPRISE_ACCESS_KEY") : System.getenv("PUBLIC_GRADLE_ENTERPRISE_ACCESS_KEY") }