Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: update Bitbucket publisher #6400

Merged
merged 2 commits into from
Nov 9, 2021
Merged

refactor: update Bitbucket publisher #6400

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ffda64
refactor: update Bitbucket publisher
jbool24 Nov 6, 2021
7b96e16
Create spotty-clouds-invent.md
mmaietta Nov 8, 2021
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
6 changes: 3 additions & 3 deletions packages/app-builder-lib/src/publish/BitbucketPublisher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { HttpPublisher, PublishContext } from "electron-publish"
import { BitbucketOptions } from "builder-util-runtime/out/publishOptions"
import { configureRequestOptions, HttpExecutor } from "builder-util-runtime"
import * as FormData from "form-data"
import { readFile } from "fs/promises"
import { readFile } from "fs-extra"

export class BitbucketPublisher extends HttpPublisher {
readonly providerName = "bitbucket"
Expand All @@ -18,8 +18,8 @@ export class BitbucketPublisher extends HttpPublisher {
constructor(context: PublishContext, info: BitbucketOptions) {
super(context)

const token = process.env.BITBUCKET_TOKEN
const username = process.env.BITBUCKET_USERNAME
const token = info.token || process.env.BITBUCKET_TOKEN || null
const username = info.username || process.env.BITBUCKET_USERNAME || null

if (isEmptyOrSpaces(token)) {
throw new InvalidConfigurationError(`Bitbucket token is not set using env "BITBUCKET_TOKEN" (see https://www.electron.build/configuration/publish#BitbucketOptions)`)
Expand Down
10 changes: 10 additions & 0 deletions packages/builder-util-runtime/src/publishOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,16 @@ export interface BitbucketOptions extends PublishConfiguration {
*/
readonly owner: string

/**
* The access token to support auto-update from private bitbucket repositories.
*/
readonly token?: string | null

/**
* The user name to support auto-update from private bitbucket repositories.
*/
readonly username?: string | null

/**
* Repository slug/name
*/
Expand Down