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

Commit

Permalink
Merge branch 'atom:master' into fix-warning
Browse files Browse the repository at this point in the history
  • Loading branch information
icecream17 committed Sep 2, 2021
2 parents ed14d2b + 2053290 commit 8b1cfaf
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 10 deletions.
7 changes: 1 addition & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
name: tests
strategy:
matrix:
os: [ubuntu-18.04, macos-10.14, windows-latest]
os: [ubuntu-18.04, macos-latest, windows-latest]
channel: [beta, nightly]
fail-fast: false
runs-on: ${{ matrix.os }}
Expand All @@ -24,11 +24,6 @@ jobs:
with:
channel: ${{ matrix.channel }}

- name: install windows build tools
if: contains(matrix.os, 'windows')
run: |
choco install visualcpp-build-tools --version=14.0.25420.1 --ignore-dependencies -y --params "'/IncludeRequired'"
echo "VCTargetsPath='C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\v140'" >> $GITHUB_ENV
- name: install dependencies
run: apm ci

Expand Down
2 changes: 1 addition & 1 deletion lib/relay-network-layer-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function logRatelimitApi(headers) {
const resetsIn = moment.unix(parseInt(resets, 10)).from();

// eslint-disable-next-line no-console
console.debug(`GitHub API Rate Limit: ${remaining}/${total} — resets ${resetsIn}`);
console.debug(`GitHub API Rate Limiting Info: ${remaining}/${total} requests left — resets ${resetsIn}`);
}

export function expectRelayQuery(operationPattern, response) {
Expand Down
2 changes: 1 addition & 1 deletion lib/worker-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ export class RendererProcess {
this.onExecStarted = onExecStarted;

this.win = new BrowserWindow({show: !!process.env.ATOM_GITHUB_SHOW_RENDERER_WINDOW,
webPreferences: {nodeIntegration: true}});
webPreferences: {nodeIntegration: true, enableRemoteModule: true}});
this.webContents = this.win.webContents;
// this.webContents.openDevTools();

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "github",
"main": "./lib/index",
"version": "0.36.9",
"version": "0.36.10",
"description": "GitHub integration",
"repository": "https://github.com/atom/github",
"license": "MIT",
Expand Down

0 comments on commit 8b1cfaf

Please sign in to comment.