actions/toolkit
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/actions/toolkit synced 2026-04-04 00:53:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

check proxy bypass before setting proxy agent (#320)

Browse Source
This commit is contained in:
eric sciple
2020-01-23 14:35:41 -05:00
committed by Bryan MacFarlane
parent 80e6ba7033
commit 432a78c48c
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/github/src/github.ts
View File

@@ -12,7 +12,7 @@ import {
import Octokit from '@octokit/rest'
import * as Context from './context'
import * as http from 'http'
import {HttpClient} from '@actions/http-client'
import * as httpClient from '@actions/http-client'
// We need this in order to extend Octokit
Octokit.prototype = new Octokit()
@@ -122,10 +122,10 @@ export class GitHub extends Octokit {
options: Octokit.Options
): http.Agent | undefined {
if (!options.request?.agent) {
const proxyUrl = process.env['https_proxy'] || process.env['HTTPS_PROXY']
if (proxyUrl) {
const httpClient = new HttpClient()
return httpClient.getAgent('https://api.github.com')
const serverUrl = 'https://api.github.com'
if (httpClient.getProxyUrl(serverUrl)) {
const hc = new httpClient.HttpClient()
return hc.getAgent(serverUrl)
}
}