actions
/
toolkit
mirror of https://github.com/actions/toolkit
1
0
Fork 0
Code

using results URL to check ghes for artifact

pull/1646/head
eggyhead 2024-01-31 01:57:50 +00:00
parent fe8c762d61
commit b680ef8e68
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/artifact/__tests__/config.test.ts
View File

@ -12,15 +12,11 @@ describe('isGhes', () => {
expect(config.isGhes()).toBe(false) expect(config.isGhes()).toBe(false)
}) })
it('should return false when the request domain ends with ghe.com', () => { it('should return false when the request has ACTIONS_RESULTS_URL set', () => {
process.env.GITHUB_SERVER_URL = 'https://github.ghe.com' process.env.ACTIONS_RESULTS_URL = 'my.results.url'
expect(config.isGhes()).toBe(false) expect(config.isGhes()).toBe(false)
}) })
it('should return false when the request domain ends with ghe.localhost', () => {
process.env.GITHUB_SERVER_URL = 'https://github.ghe.localhost'
expect(config.isGhes()).toBe(false)
})
it('should return false when the request domain is specific to an enterprise', () => { it('should return false when the request domain is specific to an enterprise', () => {
process.env.GITHUB_SERVER_URL = 'https://my-enterprise.github.com' process.env.GITHUB_SERVER_URL = 'https://my-enterprise.github.com'

15
packages/artifact/src/internal/shared/config.ts
View File

@ -27,16 +27,11 @@ export function isGhes(): boolean {
const ghUrl = new URL( const ghUrl = new URL(
process.env['GITHUB_SERVER_URL'] || 'https://github.com' process.env['GITHUB_SERVER_URL'] || 'https://github.com'
) )
let githubHosts = [ const isGitHubHost = (ghUrl.hostname.trimEnd().toUpperCase() === 'GITHUB.COM')
'GITHUB.COM', const isResultsServiceRequest = process.env['ACTIONS_RESULTS_URL'] != undefined
'GITHUB.GHE.COM',
'GITHUB.GHE.LOCALHOST' return !isGitHubHost && !isResultsServiceRequest
];
const hostname = ghUrl.hostname.trimEnd().toUpperCase()
return !githubHosts.includes(hostname)
} }
export function getGitHubWorkspaceDir(): string { export function getGitHubWorkspaceDir(): string {