Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Commit 3a668f8

Browse files
committed
Merge remote-tracking branch 'origin/master' into pr-2209/atom/aw/refactor-dialogs
2 parents 9446510 + 5db1eed commit 3a668f8

24 files changed

+836
-186
lines changed

azure-pipelines.yml

Lines changed: 29 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1+
trigger:
2+
branches:
3+
include:
4+
- master
5+
- '*-releases'
6+
pr:
7+
branches:
8+
include:
9+
- '*'
10+
111
jobs:
212
- job: Linux
313
pool:
414
vmImage: ubuntu-16.04
5-
strategy:
6-
matrix:
7-
dev:
8-
atom_channel: dev
9-
atom_name: atom-dev
10-
beta:
11-
atom_channel: beta
12-
atom_name: atom-beta
13-
stable:
14-
atom_channel: stable
15-
atom_name: atom
1615
variables:
1716
display: ":99"
17+
atom_channel: dev
18+
atom_name: atom-dev
1819
steps:
1920
- template: script/azure-pipelines/linux-install.yml
2021
parameters:
@@ -38,10 +39,14 @@ jobs:
3839
- bash: npm run report:coverage
3940
displayName: generate code coverage reports
4041
condition: succeededOrFailed()
41-
- bash: npm run codecov -- --build="Linux $(atom_channel)"
42+
- bash: |
43+
env
44+
bash <(curl -s https://codecov.io/bash) -n "Linux $(atom_channel)" -P "${VCS_PULL_REQUEST}" -B "${VCS_BRANCH_NAME}"
4245
displayName: publish code coverage to CodeCov
4346
env:
4447
CODECOV_TOKEN: $(codecov.token)
48+
VCS_BRANCH_NAME: $[coalesce(variables.System.PullRequest.SourceBranch, variables.Build.SourceBranch)]
49+
VCS_PULL_REQUEST: $(System.PullRequest.PullRequestNumber)
4550
condition: succeededOrFailed()
4651
- task: PublishCodeCoverageResults@1
4752
inputs:
@@ -53,17 +58,9 @@ jobs:
5358
- job: MacOS
5459
pool:
5560
vmImage: macos-10.13
56-
strategy:
57-
matrix:
58-
dev:
59-
atom_channel: dev
60-
atom_app: Atom Dev.app
61-
beta:
62-
atom_channel: beta
63-
atom_app: Atom Beta.app
64-
stable:
65-
atom_channel: stable
66-
atom_app: Atom.app
61+
variables:
62+
atom_channel: dev
63+
atom_app: Atom Dev.app
6764
steps:
6865
- template: script/azure-pipelines/macos-install.yml
6966
parameters:
@@ -87,10 +84,12 @@ jobs:
8784
- bash: npm run report:coverage
8885
displayName: generate code coverage reports
8986
condition: succeededOrFailed()
90-
- bash: npm run codecov -- --build="MacOS $(atom_channel)"
87+
- bash: bash <(curl -s https://codecov.io/bash) -n "MacOS $(atom_channel)" -P "${VCS_PULL_REQUEST}" -B "${VCS_BRANCH_NAME}"
9188
displayName: publish code coverage to CodeCov
9289
env:
9390
CODECOV_TOKEN: $(codecov.token)
91+
VCS_BRANCH_NAME: $[coalesce(variables.System.PullRequest.SourceBranch, variables.Build.SourceBranch)]
92+
VCS_PULL_REQUEST: $(System.PullRequest.PullRequestNumber)
9493
condition: succeededOrFailed()
9594
- task: PublishCodeCoverageResults@1
9695
inputs:
@@ -102,17 +101,9 @@ jobs:
102101
- job: Windows
103102
pool:
104103
vmImage: vs2015-win2012r2
105-
strategy:
106-
matrix:
107-
dev:
108-
atom_channel: dev
109-
atom_directory: Atom Dev
110-
beta:
111-
atom_channel: beta
112-
atom_directory: Atom Beta
113-
stable:
114-
atom_channel: stable
115-
atom_directory: Atom
104+
variables:
105+
atom_channel: dev
106+
atom_directory: Atom Dev
116107
steps:
117108
- template: script/azure-pipelines/windows-install.yml
118109
parameters:
@@ -156,10 +147,12 @@ jobs:
156147
- powershell: npm run report:coverage
157148
displayName: generate code coverage reports
158149
condition: succeededOrFailed()
159-
- powershell: npm run codecov -- --build="Windows $(atom_channel)"
150+
- bash: bash <(curl -s https://codecov.io/bash) -n "Windows $(atom_channel)" -P "${VCS_PULL_REQUEST}" -B "${VCS_BRANCH_NAME}"
160151
displayName: publish code coverage to CodeCov
161152
env:
162153
CODECOV_TOKEN: $(codecov.token)
154+
VCS_BRANCH_NAME: $[coalesce(variables.System.PullRequest.SourceBranch, variables.Build.SourceBranch)]
155+
VCS_PULL_REQUEST: $(System.PullRequest.PullRequestNumber)
163156
condition: succeededOrFailed()
164157
- task: PublishCodeCoverageResults@1
165158
inputs:

graphql/schema.graphql

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3022,6 +3022,9 @@ input CreateProjectInput {
30223022
"""The description of project."""
30233023
body: String
30243024

3025+
"""The name of the GitHub-provided template."""
3026+
template: ProjectTemplate
3027+
30253028
"""A unique identifier for the client performing the mutation."""
30263029
clientMutationId: String
30273030
}
@@ -5835,6 +5838,41 @@ enum MergeableState {
58355838
UNKNOWN
58365839
}
58375840

5841+
"""Autogenerated input type of MergeBranch"""
5842+
input MergeBranchInput {
5843+
"""
5844+
The Node ID of the Repository containing the base branch that will be modified.
5845+
"""
5846+
repositoryId: ID!
5847+
5848+
"""
5849+
The name of the base branch that the provided head will be merged into.
5850+
"""
5851+
base: String!
5852+
5853+
"""
5854+
The head to merge into the base branch. This can be a branch name or a commit GitObjectID.
5855+
"""
5856+
head: String!
5857+
5858+
"""
5859+
Message to use for the merge commit. If omitted, a default will be used.
5860+
"""
5861+
commitMessage: String
5862+
5863+
"""A unique identifier for the client performing the mutation."""
5864+
clientMutationId: String
5865+
}
5866+
5867+
"""Autogenerated return type of MergeBranch"""
5868+
type MergeBranchPayload {
5869+
"""A unique identifier for the client performing the mutation."""
5870+
clientMutationId: String
5871+
5872+
"""The resulting merge Commit."""
5873+
mergeCommit: Commit
5874+
}
5875+
58385876
"""Represents a 'merged' event on a given pull request."""
58395877
type MergedEvent implements Node & UniformResourceLocatable {
58405878
"""Identifies the actor who performed the event."""
@@ -6278,6 +6316,9 @@ type Mutation {
62786316
"""Lock a lockable object"""
62796317
lockLockable(input: LockLockableInput!): LockLockablePayload
62806318

6319+
"""Merge a head into a branch."""
6320+
mergeBranch(input: MergeBranchInput!): MergeBranchPayload
6321+
62816322
"""Merge a pull request."""
62826323
mergePullRequest(input: MergePullRequestInput!): MergePullRequestPayload
62836324

@@ -6365,6 +6406,9 @@ type Mutation {
63656406
"""Update a Git Ref."""
63666407
updateRef(input: UpdateRefInput!): UpdateRefPayload
63676408

6409+
"""Update information about a repository."""
6410+
updateRepository(input: UpdateRepositoryInput!): UpdateRepositoryPayload
6411+
63686412
"""Updates the state for subscribable subjects."""
63696413
updateSubscription(input: UpdateSubscriptionInput!): UpdateSubscriptionPayload
63706414

@@ -7528,6 +7572,27 @@ enum ProjectState {
75287572
CLOSED
75297573
}
75307574

7575+
"""GitHub-provided templates for Projects"""
7576+
enum ProjectTemplate {
7577+
"""Create a board with columns for To do, In progress and Done."""
7578+
BASIC_KANBAN
7579+
7580+
"""
7581+
Create a board with v2 triggers to automatically move cards across To do, In progress and Done columns.
7582+
"""
7583+
AUTOMATED_KANBAN_V2
7584+
7585+
"""
7586+
Create a board with triggers to automatically move cards across columns with review automation.
7587+
"""
7588+
AUTOMATED_REVIEWS_KANBAN
7589+
7590+
"""
7591+
Create a board to triage and prioritize bugs with To do, priority, and Done columns.
7592+
"""
7593+
BUG_TRIAGE
7594+
}
7595+
75317596
"""A user's public key."""
75327597
type PublicKey implements Node {
75337598
"""
@@ -13117,6 +13182,54 @@ type UpdateRefPayload {
1311713182
ref: Ref
1311813183
}
1311913184

13185+
"""Autogenerated input type of UpdateRepository"""
13186+
input UpdateRepositoryInput {
13187+
"""The ID of the repository to update."""
13188+
repositoryId: ID!
13189+
13190+
"""The new name of the repository."""
13191+
name: String
13192+
13193+
"""
13194+
A new description for the repository. Pass an empty string to erase the existing description.
13195+
"""
13196+
description: String
13197+
13198+
"""
13199+
Whether this repository should be marked as a template such that anyone who
13200+
can access it can create new repositories with the same files and directory structure.
13201+
"""
13202+
template: Boolean
13203+
13204+
"""
13205+
The URL for a web page about this repository. Pass an empty string to erase the existing URL.
13206+
"""
13207+
homepageUrl: URI
13208+
13209+
"""Indicates if the repository should have the wiki feature enabled."""
13210+
hasWikiEnabled: Boolean
13211+
13212+
"""Indicates if the repository should have the issues feature enabled."""
13213+
hasIssuesEnabled: Boolean
13214+
13215+
"""
13216+
Indicates if the repository should have the project boards feature enabled.
13217+
"""
13218+
hasProjectsEnabled: Boolean
13219+
13220+
"""A unique identifier for the client performing the mutation."""
13221+
clientMutationId: String
13222+
}
13223+
13224+
"""Autogenerated return type of UpdateRepository"""
13225+
type UpdateRepositoryPayload {
13226+
"""A unique identifier for the client performing the mutation."""
13227+
clientMutationId: String
13228+
13229+
"""The updated repository."""
13230+
repository: Repository
13231+
}
13232+
1312013233
"""Autogenerated input type of UpdateSubscription"""
1312113234
input UpdateSubscriptionInput {
1312213235
"""The Node ID of the subscribable object to modify."""

0 commit comments

Comments
 (0)