Skip to content

Commit 462f926

Browse files
committed
Merged master
2 parents fccbbfa + 86ebfc9 commit 462f926

File tree

13 files changed

+91
-16
lines changed

13 files changed

+91
-16
lines changed

.github/workflows/deploy.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Master branch deploy
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
branches:
8+
- master
9+
10+
jobs:
11+
build_deploy:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@master
15+
- run: npm install
16+
- run: npm run build
17+
- name: Deploy
18+
uses: peaceiris/actions-gh-pages@v3
19+
with:
20+
PUBLISH_DIR: _site
21+
PUBLISH_BRANCH: gh-pages
22+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Manual deploy
2+
on:
3+
workflow_dispatch
4+
5+
jobs:
6+
build_deploy:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@master
10+
- run: npm install
11+
- run: npm run build
12+
- name: Deploy
13+
uses: peaceiris/actions-gh-pages@v3
14+
with:
15+
PUBLISH_DIR: _site
16+
PUBLISH_BRANCH: gh-pages
17+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.travis.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

child-processes/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ url: child-processes
55
author: ian
66
---
77

8+
<<<<<<< HEAD
89
_Prerequisites: [events](../events), [streams](../buffers-and-streams)_
910

1011
The typical operating system has different processes running in the background, and each process is being managed by a single-core of our CPU and will run a series of calculations each time it is being ticked. To take full advantage of our CPU using a single process, we would need a number of processes that is at least equal to the number of cores in our CPU. In addition, each process might be responsible for running a series of calculations of different logic, which will give the end user a better control over the CPU’s behavior.

diagnostics/index.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ layout: default
33
title: Diagnostics
44
---
55

6-
I've seen things you people wouldn't believe. Attack ships on fire off the shoulder of Orion. I watched C-beams glitter in the dark near the Tannhäuser Gate. All those moments will be lost in time, like disgnostics.
6+
Coming soon.
7+
8+
In the meantime, please see https://github.com/nodejs/diagnostics

error-handling/index.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
layout: default
3+
title: Error Handling
4+
---
5+
6+
Coming soon.

file-system/index.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
layout: default
3+
title: File System
4+
---
5+
6+
Coming soon.

javascript-prerequisites/index.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
layout: default
3+
title: JavaScript Prerequisites
4+
---
5+
6+
Coming soon.

module-system/index.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
layout: default
3+
title: Module System
4+
---
5+
6+
Coming soon.

nodejs-cli/index.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
layout: default
3+
title: Node CLI
4+
---
5+
6+
Coming soon.

0 commit comments

Comments
 (0)