Skip to content

Commit 1e44780

Browse files
committed
Merge branch '1.0.x' of github.com:rsocket/rsocket-js into 1.0.x
2 parents 1fc2e19 + 8dbb0e4 commit 1e44780

File tree

2 files changed

+37
-9
lines changed

2 files changed

+37
-9
lines changed

.github/workflows/build.yml

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Lint
3737
run: yarn lint
3838

39-
compile_and_test:
39+
test:
4040
runs-on: ubuntu-latest
4141

4242
steps:
@@ -63,8 +63,35 @@ jobs:
6363
- name: Install dependencies
6464
run: yarn --frozen-lockfile
6565

66-
- name: Compile
67-
run: yarn build
68-
6966
- name: Test
7067
run: yarn test
68+
69+
compile:
70+
runs-on: ubuntu-latest
71+
72+
steps:
73+
- name: Checkout
74+
uses: actions/checkout@v2
75+
76+
- name: Install Node
77+
uses: actions/setup-node@v2
78+
with:
79+
node-version: 12
80+
81+
- name: Install Yarn
82+
run: npm install -g yarn
83+
84+
- name: Cache dependencies
85+
uses: actions/cache@v2
86+
with:
87+
path: ~/.yarn
88+
key: ${{ runner.OS }}-node-${{ hashFiles('**/yarn.lock') }}
89+
restore-keys: |
90+
${{ runner.OS }}-node-
91+
${{ runner.OS }}-
92+
93+
- name: Install dependencies
94+
run: yarn --frozen-lockfile
95+
96+
- name: Compile
97+
run: yarn build

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1+
## Under Development
12

2-
# Under Development
3-
4-
**This branch is a work in progress rewrite of rsocket-js from [Flow](https://flow.org/) to [TypeScript](https://www.typescriptlang.org/).**
3+
**This branch is a work in progress rewrite of rsocket-js from [Flow](https://flow.org/) to [TypeScript](https://www.typescriptlang.org/). Please see [#158](https://github.com/rsocket/rsocket-js/issues/158).**
54

65
**You SHOULD NOT leverage any artifacts published from this branch as all are considered unstable.**
76

7+
**Please see the [master](https://github.com/rsocket/rsocket-js/tree/master) branch for source used to publish the latest `0.x.x` versions on NPM.**
8+
89
# [rsocket-js](https://github.com/rsocket/rsocket-js)
910

10-
[![Build Status](https://github.com/rsocket/rsocket-js/actions/workflows/test.yml/badge.svg)](https://github.com/rsocket/rsocket-js/actions/workflows/test.yml)
11+
[![Build](https://github.com/rsocket/rsocket-js/actions/workflows/build.yml/badge.svg?branch=1.0.x)](https://github.com/rsocket/rsocket-js/actions/workflows/build.yml)
1112

1213
A JavaScript implementation of the [RSocket](https://github.com/rsocket/rsocket)
1314
protocol intended for use in browsers and/or Node.js. From [rsocket.io](http://rsocket.io/):
@@ -31,7 +32,7 @@ TODO: add install instructions
3132

3233
## Contributing
3334

34-
See the `CONTRIBUTING.md` file for how to help out.
35+
TODO: add `CONTRIBUTING.md`
3536

3637
## Documentation
3738

0 commit comments

Comments
 (0)