From 503e50acb91693ca8e1a5dda95fc0cc0869235a4 Mon Sep 17 00:00:00 2001 From: Pavel Iakovenko Date: Fri, 5 Aug 2022 13:29:49 -0400 Subject: [PATCH] Support running Actions services on subdomain (#2041) --- src/Runner.Listener/Configuration/ConfigurationManager.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Runner.Listener/Configuration/ConfigurationManager.cs b/src/Runner.Listener/Configuration/ConfigurationManager.cs index 5f79dd550..410bec8f6 100644 --- a/src/Runner.Listener/Configuration/ConfigurationManager.cs +++ b/src/Runner.Listener/Configuration/ConfigurationManager.cs @@ -3,6 +3,7 @@ using GitHub.Runner.Common; using GitHub.Runner.Common.Util; using GitHub.Runner.Sdk; using GitHub.Services.Common; +using GitHub.Services.Common.Internal; using GitHub.Services.OAuth; using System; using System.Collections.Generic; @@ -128,7 +129,7 @@ namespace GitHub.Runner.Listener.Configuration // Example githubServerUrl is https://my-ghes var actionsServerUrl = new Uri(runnerSettings.ServerUrl); var githubServerUrl = new Uri(runnerSettings.GitHubUrl); - if (!string.Equals(actionsServerUrl.Authority, githubServerUrl.Authority, StringComparison.OrdinalIgnoreCase)) + if (!UriUtility.IsSubdomainOf(actionsServerUrl.Authority, githubServerUrl.Authority)) { throw new InvalidOperationException($"GitHub Actions is not properly configured in GHES. GHES url: {runnerSettings.GitHubUrl}, Actions url: {runnerSettings.ServerUrl}."); }