Skip to content

Commit d177860

Browse files
committed
Merge remote-tracking branch 'upstream/master' into setup-acttions-finish
2 parents 8d1a789 + 8e10ef6 commit d177860

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+4147
-2780
lines changed

ISSUE_TEMPLATE.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,31 @@ Do you want to ask a question? Are you looking for support? The Atom message boa
2020

2121
### Description
2222

23-
[Description of the issue]
23+
<!-- High-level description of what's going wrong. Please be sure to include any stack traces that appear in the developer console or the exact text of any error notifications that are shown. -->
2424

2525
### Steps to Reproduce
2626

27-
1. [First Step]
28-
2. [Second Step]
29-
3. [and so on...]
27+
1. <!-- First Step -->
28+
2. <!-- Second Step -->
29+
3. <!-- and so on... -->
3030

3131
**Expected behavior:**
3232

33-
[What did you expect to happen?]
33+
<!-- What did you expect to happen? -->
3434

3535
**Actual behavior:**
3636

37-
[What actually happened instead?]
37+
<!-- What actually happened instead? -->
3838

3939
**Reproduces how often:**
4040

41-
[What percentage of the time does this happen?]
41+
<!-- Roughly what percentage of the time does this happen? Is this issue an intermittent glitch or does it occur consistently? -->
4242

43-
### Versions
43+
### Platform and Versions
4444

45-
You can get this information from copy and pasting the output of `atom --version` and `apm --version` from the command line. Also, please include the OS and what version of the OS you're running.
45+
What OS and version of OS are you running?
46+
47+
What version of Atom are you using? You can get this information from copy and pasting the output of `atom --version` and `apm --version` from the command line.
4648

4749
### Additional Information
4850

PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
### Requirements
44

55
* Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
6-
* Suggestion: You can use checklists to keep track of progress for the sections on metrics, tests, documentation, and user research.
76

87
### Description of the Change
98

@@ -13,70 +12,10 @@ We must be able to understand the design of your change from this description. I
1312
1413
-->
1514

16-
### Screenshot/Gif
15+
### Screenshot or Gif
1716

1817
<!-- If the changes are visual, add a screenshot or record a Gif. This doesn't have to be updated during implementation, but after a PR is merged, a final screenshot/gif should be added. It might get used for blog posts, documentation etc. Write "N/A" if not applicable. -->
1918

20-
### Alternate Designs
21-
22-
<!-- Explain what other alternates were considered and why the proposed version was selected -->
23-
24-
### Benefits
25-
26-
<!-- What benefits will be realized by the code change? -->
27-
28-
### Possible Drawbacks
29-
30-
<!-- What are the possible side-effects or negative impacts of the code change? -->
31-
3219
### Applicable Issues
3320

34-
<!-- Enter any applicable Issues here -->
35-
36-
### Metrics
37-
38-
<!-- What metrics are associated with this code change and what questions can they help us answer? Write "N/A" if not applicable. -->
39-
40-
### Tests
41-
42-
<!--
43-
44-
How did you verify that your change has the desired effects?
45-
- How did you verify that all new functionality works as expected?
46-
- How did you verify that all changed functionality works as expected?
47-
- How did you verify that the change has not introduced any regressions?
48-
49-
What unit or integration tests were (or will be) added to help protect against future regressions?
50-
For manual testing, be sure to describe in detail the actions you performed (including buttons you clicked, text you typed, commands you ran, etc.), and the results you observed.
51-
If you chose not to include a specific test, please explain why.
52-
53-
Write "N/A" if not applicable.
54-
55-
-->
56-
57-
### Documentation
58-
59-
<!-- Describe the documentation added or improved. Write "N/A" if not applicable. -->
60-
61-
### Release Notes
62-
63-
<!--
64-
65-
Please describe the changes in a single line that explains this improvement in
66-
terms that a user can understand. This text will be used in Atom's release notes.
67-
68-
If this change is not user-facing or notable enough to be included in release notes
69-
you may use the strings "Not applicable" or "N/A" here.
70-
71-
Examples:
72-
73-
- The GitHub package now allows you to add co-authors to commits.
74-
- Fixed an issue where the merge message did not show up in the commit message box.
75-
- Increased the performance of rendering diffs.
76-
77-
-->
78-
79-
### User Experience Research (Optional)
80-
81-
<!-- If this change would benefit from UXR, please state assumptions or hypotheses and specify if they are to be validated before or after releasing. Examples include investigating discoverability, verifying performance improvements, tracking metrics, etc. -->
82-
21+
<!-- Cross-reference any applicable Issues here. Use "Fixes #NNN" or "Closes #NNN" syntax to automatically close linked issues on merge. -->

actions/auto-sprint/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

actions/schema-up/package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

actions/schema-up/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"dependencies": {
99
"actions-toolkit": "2.2.0",
1010
"graphql": "14.5.8",
11-
"node-fetch": "2.6.0",
11+
"node-fetch": "2.6.1",
1212
"relay-compiler": "7.1.0"
1313
}
1414
}

docs/installation.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Installation
2+
3+
The GitHub package is bundled as a core package within Atom. This means that you don't have to install it separately - download Atom from [the website](https://atom.io) and it's included automatically. This carries a number of benefits. For example, because it's included in the [v8 snapshot](https://flight-manual.atom.io/behind-atom/sections/how-atom-uses-chromium-snapshots/) produced during each Atom build, it boots extremely quickly and pays very little penalty for things like requiring and bootstrapping React.
4+
5+
However! The downside of this is that it can take a while for new work in this repository to make its way into your editor. Here's the full lifecycle of a change:
6+
7+
1. First, the change is done via a pull request to this repository. When it's ready and has full, passing test coverage, it's merged into the default branch.
8+
2. Periodically, we tag and publish batches of changes as new versions to [apm](https://atom.io/packages/github). Typically, this is done after a major bugfix or new feature is merged, or after merging a security-related dependency update.
9+
3. Next, we send a pull request to [the core atom repository](https://github.com/atom/atom) to bump the versions of the GitHub package dependency in its `package.json` and `package-lock.json` files. When that pull request has a green build, we merge it.
10+
4. The next night that the [Atom core nightly build](https://github.visualstudio.com/Atom/_build?definitionId=1) is successful, the new package version is released to the [Atom nightly channel](https://atom.io/nightly).
11+
5. The core Atom team regularly "rolls the railcars" to tag new release. The first time that this happens after the GitHub package dependency bump is merged, it will be included on the next release of the [Atom beta channel](https://atom.io/beta).
12+
6. The next time that the core Atom team "rolls the railcars" after that, the new GitHub package version is shipped to [Atom stable](https://atom.io/). :rocket: :tada:
13+
14+
Depending on the timing, all of this can take a month and a half to two months, so when you see a pull request get merged and your issue closed, you might think you're out of luck and you'll just have to wait... but, you have a few other options here.
15+
16+
## Use a non-stable Atom channel
17+
18+
Instead of living at the end of the line way out on stable, you could switch to the beta or nightly channels of Atom releases.
19+
20+
* The [beta channel](https://atom.io/beta) updates a little more frequently than the stable channel, but it's about a month ahead. This means that you'll have access to GitHub package work as soon as the next time the railcars are rolled (step 5 up above) - about a month sooner than you would if you stayed on stable.
21+
* The [nightly channel](https://atom.io/nightly) is updated about daily with the latest and greatest Atom build, including everything that was merged into Atom core up to that point. If you use the nightly channel, you'll have access to GitHub package work as soon as it's published in a release and merged into Atom core (step 4 up above).
22+
23+
### Benefits
24+
25+
By using a "fresher" Atom channel, you'll have access to features and bug-fixes much sooner than you will if you use a stable build. Despite the names, our beta and nightly channels are pretty stable... I've (@smashwilson) personally been using a nightly build for my day to day editing for years now.
26+
27+
What's more, if you _do_ experience a serious regression - with the GitHub package or any other core behavior - you can:
28+
29+
* File an issue to let us know, then:
30+
* Switch to the next channel (from nightly to beta, or beta to stable).
31+
32+
That gives us a chance to respond to the issue, determine if it's serious enough to warrant delaying a release for if we can't fix it in time, and could prevent an order of magnitude more users from encountering the same problem... _and_ gives you a route to _immediately_ revert to an Atom version that unblocks you!
33+
34+
## Live on the edge
35+
36+
If you're using nightly builds, you can have access to fixes and improvements (often) within a few weeks to a month. But, it can take me some time to tag releases and get them into Atom core sometimes. If you're really can't wait, and you want to live on the very, very edge, you can run the absolute latest code as soon as it's merged.
37+
38+
1. First, install Atom's build requirements. You don't have to clone, bootstrap and build all of Atom to do this - just install the packages and dependencies listed in the "Building" section on [the flight manual documentation](https://flight-manual.atom.io/hacking-atom/sections/hacking-on-atom-core/) for your operating system.
39+
2. Second, run the following command at your terminal or command line prompt:
40+
```
41+
apm install atom/github
42+
```
43+
44+
Now you'll be running everything as soon as it's merged... and `apm` will automatically keep it that way, as we merge more work!
45+
46+
:warning: Be aware! Using this method _will_ have noticeably degrade Atom's startup time. It's especially impactful the first time you launch Atom after each update, because Atom will be transpiling all of the package source. After that, you'll essentially be missing out on the benefits of having it included in the v8 snapshot.

docs/troubleshooting.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Troubleshooting guide
2+
3+
So, you're having a problem with this package, and you're not sure what's going on. Here are a few tools that you can use to collect more information on your problem to help us help you faster.
4+
5+
The more debugging information you can provide, the easier it will be for us to figure out what's going on, even if your problem is triggered by some configuration or local state on your machine... and the more likely it will be that we'll be able to help you out.
6+
7+
## Atom debugging guide
8+
9+
Be sure to look over the [Atom debugging guide](https://flight-manual.atom.io/hacking-atom/sections/debugging/), as everything written there also applies here.
10+
11+
Take special note of the [section on the developer tools](https://flight-manual.atom.io/hacking-atom/sections/debugging/#check-for-errors-in-the-developer-tools). Any time that the package "crashes" (git and GitHub status bar buttons vanish, tabs go blank, commands are no longer present in the command palette) there's almost certainly a stack trace waiting for you in the developer tools. Copy and paste that into your issue within a triple-backtick code block and it will give us worlds more information about what's going on. For many problems, having a stack trace to work with almost single-handedly makes the difference between us not being able to do anything and us being able to land a fix.
12+
13+
## Git diagnostics
14+
15+
If your problem is related to specific git operations or interactions - like problems committing, pushing, or fetching - then it can be very helpful to collect git command diagnostics.
16+
17+
To enable git diagnostic collection:
18+
19+
* Open your [Settings tab](https://flight-manual.atom.io/getting-started/sections/atom-basics/#settings-and-preferences).
20+
* Navigate to the "Packages" section on the lefthand side.
21+
* Search for "github" in the search box.
22+
* Click "settings" on the "github" package result.
23+
* Check the checkbox labelled "Git diagnostics".
24+
25+
Now, reproduce your problem. Every git command that's executed by this package will be logged to the developer console, including input, stdout and stderr, and exit codes, with full verbose tracing. Expand the collapsed sections corresponding to the relevant commands and copy-and-paste the results in your issue.
26+
27+
:warning: While the git logging will elide things like passphrases for you, you may wish to manually remove references to usernames, paths, or repository URLs if you wish, for privacy reasons.

0 commit comments

Comments
 (0)