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
2 changes: 2 additions & 0 deletions .github/workflows/act.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,11 @@ jobs:
env:
GH_USERNAME: ${{ github.repository_owner }}
GH_ACCESS_TOKEN: ${{ steps.app-token.outputs.token || github.token }}
GH_CREDENTIAL_USERNAME: x-access-token
run: |
GH_USERNAME="${GH_USERNAME}" \
GH_ACCESS_TOKEN="${GH_ACCESS_TOKEN}" \
GH_CREDENTIAL_USERNAME="${GH_CREDENTIAL_USERNAME}" \
KUBECONFIG="${KUBECONFIG:-$HOME/.kube/config}" \
PATH="${PATH}" \
GOROOT="${GOROOT}" \
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/pr-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -374,18 +374,21 @@ jobs:
# NOTE: GitHub credentials are required for tests using private repos
GH_USERNAME: ${{ github.repository_owner }}
GH_ACCESS_TOKEN: ${{ steps.app-token.outputs.token || github.token }}
GH_CREDENTIAL_USERNAME: x-access-token
run: |
if [ "${{ runner.os }}" == "Linux" ]; then
sudo \
GH_USERNAME="${GH_USERNAME}" \
GH_ACCESS_TOKEN="${GH_ACCESS_TOKEN}" \
GH_CREDENTIAL_USERNAME="${GH_CREDENTIAL_USERNAME}" \
KUBECONFIG="${KUBECONFIG:-$HOME/.kube/config}" \
PATH="${PATH}" \
GOROOT="${GOROOT}" \
go test -v -ginkgo.v -timeout 900s --ginkgo.label-filter="${{ matrix.label }}"
else
GH_USERNAME="${GH_USERNAME}" \
GH_ACCESS_TOKEN="${GH_ACCESS_TOKEN}" \
GH_CREDENTIAL_USERNAME="${GH_CREDENTIAL_USERNAME}" \
KUBECONFIG="${KUBECONFIG:-$HOME/.kube/config}" \
PATH="${PATH}" \
GOROOT="${GOROOT}" \
Expand Down
8 changes: 7 additions & 1 deletion e2e/tests/up/up_private_token.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ var _ = ginkgo.Describe(
ginkgo.Skip("GH_USERNAME and GH_ACCESS_TOKEN must be set")
}

// GitHub App tokens require "x-access-token" as the credential username
credUser := os.Getenv("GH_CREDENTIAL_USERNAME")
if credUser == "" {
credUser = username
}

f, err := setupDockerProvider(initialDir+"/bin", "docker")
framework.ExpectNoError(err)

Expand All @@ -41,7 +47,7 @@ var _ = ginkgo.Describe(
Run()
framework.ExpectNoError(err)

gitCredentialString := []byte("https://" + username + ":" + token + "@github.com")
gitCredentialString := []byte("https://" + credUser + ":" + token + "@github.com")
err = os.WriteFile(credentialPath, gitCredentialString, 0o600)
framework.ExpectNoError(err)

Expand Down
Loading