From eef3d4006aa651e2f3c7684f2c54852b55f8a703 Mon Sep 17 00:00:00 2001 From: Hannam Rhee Date: Mon, 5 Jun 2023 11:35:57 +0900 Subject: [PATCH 1/6] initial commit --- .github/workflows/actions_build.yml | 1 + settings.gradle | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml index 5df8b5633a0..bcf7c41ffae 100644 --- a/.github/workflows/actions_build.yml +++ b/.github/workflows/actions_build.yml @@ -18,6 +18,7 @@ concurrency: env: LC_ALL: "en_US.UTF-8" BUILD_JDK_VERSION: "19" + GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} jobs: build: diff --git a/settings.gradle b/settings.gradle index f56e10a7684..dfbd6e2acbf 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,6 +6,8 @@ plugins { // automatically download one based on the foojay Disco API. // https://docs.gradle.org/8.1.1/userguide/toolchains.html#sec:provisioning id("org.gradle.toolchains.foojay-resolver") version "0.5.0" + id "com.gradle.enterprise" version "3.13.3" + } toolchainManagement { jvm { @@ -16,6 +18,17 @@ toolchainManagement { } } } +gradleEnterprise { + server = "https://ge.armeria.dev" + buildScan { + // publish build scans if the access key is provided + publishAlwaysIf(System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY") != null) + uploadInBackground = false + capture { + taskInputFiles = true + } + } +} rootProject.name = 'armeria' From c42e543f161b34c09373ca26657b399a61001e5b Mon Sep 17 00:00:00 2001 From: Hannam Rhee Date: Wed, 7 Jun 2023 23:23:30 +0900 Subject: [PATCH 2/6] test --- .github/workflows/actions_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml index bcf7c41ffae..c6a91b3c78c 100644 --- a/.github/workflows/actions_build.yml +++ b/.github/workflows/actions_build.yml @@ -6,7 +6,7 @@ on: tags-ignore: # The release versions will be verified by 'publish-release.yml' - armeria-* - pull_request: + pull_request_target: merge_group: concurrency: @@ -157,7 +157,7 @@ jobs: retention-days: 3 lint: - if: github.repository == 'line/armeria' + if: github.repository == 'hannam-rhee/armeria' runs-on: self-hosted timeout-minutes: 60 steps: From f1f1ff16470250f93378a73e496554e45076d011 Mon Sep 17 00:00:00 2001 From: Hannam Rhee Date: Wed, 7 Jun 2023 23:25:22 +0900 Subject: [PATCH 3/6] update repo --- .github/workflows/actions_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml index c6a91b3c78c..d316f2c31ed 100644 --- a/.github/workflows/actions_build.yml +++ b/.github/workflows/actions_build.yml @@ -157,7 +157,7 @@ jobs: retention-days: 3 lint: - if: github.repository == 'hannam-rhee/armeria' + if: github.repository == 'jrhee17/armeria' runs-on: self-hosted timeout-minutes: 60 steps: From fcd4391c568d9f653d6667cb6d88d6966671e922 Mon Sep 17 00:00:00 2001 From: Hannam Rhee Date: Wed, 7 Jun 2023 23:30:32 +0900 Subject: [PATCH 4/6] revert to pull_request --- .github/workflows/actions_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml index d316f2c31ed..65095ff408f 100644 --- a/.github/workflows/actions_build.yml +++ b/.github/workflows/actions_build.yml @@ -6,7 +6,7 @@ on: tags-ignore: # The release versions will be verified by 'publish-release.yml' - armeria-* - pull_request_target: + pull_request: merge_group: concurrency: From 665328885d69af60ad2e7d0c84296041b05caf7a Mon Sep 17 00:00:00 2001 From: Hannam Rhee Date: Wed, 7 Jun 2023 23:32:34 +0900 Subject: [PATCH 5/6] use target --- .github/workflows/actions_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml index 65095ff408f..f5baaa4ef4d 100644 --- a/.github/workflows/actions_build.yml +++ b/.github/workflows/actions_build.yml @@ -6,7 +6,7 @@ on: tags-ignore: # The release versions will be verified by 'publish-release.yml' - armeria-* - pull_request: + pull_request_target: merge_group: concurrency: @@ -158,7 +158,7 @@ jobs: lint: if: github.repository == 'jrhee17/armeria' - runs-on: self-hosted + runs-on: ubuntu-latest timeout-minutes: 60 steps: - uses: actions/checkout@v2 From cde5aa649ccb4bb6d395bd4f4ace88f7963cfb09 Mon Sep 17 00:00:00 2001 From: Hannam Rhee Date: Wed, 7 Jun 2023 23:33:29 +0900 Subject: [PATCH 6/6] trigger ci --- .github/workflows/actions_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml index f5baaa4ef4d..6a9c8f91ffe 100644 --- a/.github/workflows/actions_build.yml +++ b/.github/workflows/actions_build.yml @@ -9,6 +9,7 @@ on: pull_request_target: merge_group: + concurrency: # Cancel the previous builds in the same PR. # Allow running concurrently for all non-PR commits.