Update github API

pull/13/head
MaksimZhukov 4 years ago
parent 7a56615638
commit 347402ff31

@ -84,7 +84,7 @@ Git-CommitAllChanges -Message $CommitMessage
Write-Host "Push branch: $BranchName" Write-Host "Push branch: $BranchName"
Git-PushBranch -Name $BranchName -Force $true Git-PushBranch -Name $BranchName -Force $true
$gitHubApi = Get-GitHubApi -RepositoryFullName $RepositoryFullName -AccessToken $AccessToken $gitHubApi = Get-GitHubApi -RepositoryName $RepositoryFullName -AccessToken $AccessToken
$repositoryOwner = $RepositoryFullName.Split('/')[0] $repositoryOwner = $RepositoryFullName.Split('/')[0]
$pullRequest = $gitHubApi.GetPullRequest($BranchName, $repositoryOwner) $pullRequest = $gitHubApi.GetPullRequest($BranchName, $repositoryOwner)

@ -8,10 +8,11 @@ class GitHubApi
[object] $AuthHeader [object] $AuthHeader
GitHubApi( GitHubApi(
[string] $RepositoryFullName, [string] $AccountName,
[string] $ProjectName,
[string] $AccessToken [string] $AccessToken
) { ) {
$this.BaseUrl = $this.BuildBaseUrl($RepositoryFullName) $this.BaseUrl = $this.BuildBaseUrl($AccountName, $ProjectName)
$this.AuthHeader = $this.BuildAuth($AccessToken) $this.AuthHeader = $this.BuildAuth($AccessToken)
} }
@ -25,8 +26,8 @@ class GitHubApi
} }
} }
[string] hidden BuildBaseUrl([string]$RepositoryFullName) { [string] hidden BuildBaseUrl([string]$RepositoryOwner, [string]$RepositoryName) {
return "https://api.github.com/repos/$RepositoryFullName" return "https://api.github.com/repos/$RepositoryOwner/$RepositoryName"
} }
[object] CreateNewPullRequest([string]$Title, [string]$Body, [string]$BranchName){ [object] CreateNewPullRequest([string]$Title, [string]$Body, [string]$BranchName){
@ -144,9 +145,20 @@ class GitHubApi
function Get-GitHubApi { function Get-GitHubApi {
param ( param (
[string] $RepositoryFullName, [Parameter(ParameterSetName = 'RepositoryOwner')]
[Parameter(ParameterSetName = 'RepositoryName')]
[string] $RepositoryOwner,
[Parameter(ParameterSetName = 'RepositoryName')]
[string] $RepositoryName,
[string] $AccessToken [string] $AccessToken
) )
return [GitHubApi]::New($RepositoryFullName, $AccessToken) # Split repository name (like 'actions/versions-package-tools') in case when owner is not set
if (-not $RepositoryOwner) {
$RepositoryOwner = $RepositoryName.Split('/')[0]
}
return [GitHubApi]::New($RepositoryOwner, $RepositoryName, $AccessToken)
} }

@ -81,7 +81,7 @@ function Queue-Builds {
} }
} }
$gitHubApi = Get-GitHubApi -RepositoryFullName $RepositoryFullName -AccessToken $AccessToken $gitHubApi = Get-GitHubApi -RepositoryName $RepositoryFullName -AccessToken $AccessToken
Write-Host "Versions to build: $ToolVersions" Write-Host "Versions to build: $ToolVersions"
Queue-Builds -GitHubApi $gitHubApi ` Queue-Builds -GitHubApi $gitHubApi `

@ -25,7 +25,7 @@ Import-Module (Join-Path $PSScriptRoot "manifest-utils.psm1") -Force
$configuration = Read-ConfigurationFile -Filepath $ConfigurationFile $configuration = Read-ConfigurationFile -Filepath $ConfigurationFile
$gitHubApi = Get-GitHubApi -RepositoryFullName $RepositoryFullName -AccessToken $GitHubAccessToken $gitHubApi = Get-GitHubApi -RepositoryName $RepositoryFullName -AccessToken $GitHubAccessToken
$releases = $gitHubApi.GetReleases() $releases = $gitHubApi.GetReleases()
$versionIndex = Build-VersionsManifest -Releases $releases -Configuration $configuration $versionIndex = Build-VersionsManifest -Releases $releases -Configuration $configuration
$versionIndex | ConvertTo-Json -Depth 5 | Out-File $OutputFile -Encoding UTF8NoBOM -Force $versionIndex | ConvertTo-Json -Depth 5 | Out-File $OutputFile -Encoding UTF8NoBOM -Force

Loading…
Cancel
Save