Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/private/Commands/Initialize-RunnerEnvironment.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
Set-GitHubEnv -Name 'GITHUB_REPOSITORY_NAME' -Value $env:GITHUB_REPOSITORY_NAME

# Autologon if a token is present in environment variables
$tokenVar = Get-ChildItem -Path 'Env:' | Where-Object Name -In 'GH_TOKEN', 'GITHUB_TOKEN' | Select-Object -First 1
Write-Verbose (Get-ChildItem -Path 'Env:' | Where-Object Name -In 'GH_TOKEN', 'GITHUB_TOKEN' | Out-String)
$tokenVar = Get-ChildItem -Path 'Env:' | Where-Object Name -In 'GH_TOKEN', 'GITHUB_TOKEN' | Select-Object -First 1 -ExpandProperty Value
$tokenVarPresent = $tokenVar.count -gt 0 -and -not [string]::IsNullOrEmpty($tokenVar)
if ($tokenVarPresent) {
Connect-GitHubAccount -Repo $env:GITHUB_REPOSITORY_NAME -Owner $env:GITHUB_REPOSITORY_OWNER
Expand Down
6 changes: 3 additions & 3 deletions src/public/Auth/Connect-GitHubAccount.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
$envVars = Get-ChildItem -Path 'Env:'
Write-Debug 'Environment variables:'
Write-Debug ($envVars | Format-Table -AutoSize | Out-String)
$gitHubToken = $envVars | Where-Object Name -In 'GH_TOKEN', 'GITHUB_TOKEN' | Select-Object -First 1
$gitHubToken = $envVars | Where-Object Name -In 'GH_TOKEN', 'GITHUB_TOKEN' | Select-Object -First 1 -ExpandProperty Value
Write-Debug "GitHub token: [$gitHubToken]"
$gitHubTokenPresent = $gitHubToken.count -gt 0 -and -not [string]::IsNullOrEmpty($gitHubToken)
Write-Debug "GitHub token present: [$gitHubTokenPresent]"
Expand Down Expand Up @@ -202,9 +202,9 @@
'sPAT' {
Write-Verbose 'Logging in using GitHub access token...'
Reset-GitHubConfig -Scope 'Auth'
$prefix = $gitHubToken.Value -replace '_.*$', '_*'
$prefix = $gitHubToken -replace '_.*$', '_*'
$settings = @{
AccessToken = ConvertTo-SecureString -AsPlainText $gitHubToken.Value
AccessToken = ConvertTo-SecureString -AsPlainText $gitHubToken
AccessTokenType = $prefix
ApiBaseUri = 'https://api.github.com'
ApiVersion = '2022-11-28'
Expand Down