Skip to content
This repository was archived by the owner on Jun 27, 2023. It is now read-only.

Commit 4004991

Browse files
committed
Merge branch 'next' into feature/library-options-for-next
2 parents 09cc491 + e40f9bd commit 4004991

File tree

3 files changed

+22
-18
lines changed

3 files changed

+22
-18
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
name: ci
2-
1+
name: Release
32
on:
4-
pull_request:
5-
branches:
6-
- master,
7-
- next
8-
3+
push:
4+
branches: [$default-branch, next]
95
jobs:
10-
test-and-release:
11-
name: Run tests
6+
release:
7+
name: Run test and Release
128
runs-on: ubuntu-18.04
139
steps:
1410
- name: Checkout
15-
uses: actions/checkout@v1
11+
uses: actions/checkout@v2
1612
- name: Setup Node.js
1713
uses: actions/setup-node@v1
1814
with:
1915
node-version: 12
2016
- name: Install dependencies
2117
run: npm ci
18+
- name: Build Library
19+
run: npm run build
20+
- name: Release
21+
env:
22+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
23+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
24+
CI: true
25+
run: npm run semantic-release

.github/workflows/release.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
name: Release
22
on:
33
push:
4-
branches:
5-
- master,
6-
- next
4+
branches: [$default-branch, next]
75
jobs:
86
release:
97
name: Run test and Release
108
runs-on: ubuntu-18.04
119
steps:
1210
- name: Checkout
13-
uses: actions/checkout@v1
11+
uses: actions/checkout@v2
1412
- name: Setup Node.js
1513
uses: actions/setup-node@v1
1614
with:
@@ -19,8 +17,6 @@ jobs:
1917
run: npm ci
2018
- name: Build Library
2119
run: npm run build
22-
- name: Build Types Declarations
23-
run: npm run build:dts
2420
- name: Release
2521
env:
2622
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@
1616
},
1717
"release": {
1818
"branches": [
19-
"0.x",
20-
"next"
19+
"+([0-9])?(.{+([0-9]),x}).x",
20+
"main",
21+
"next",
22+
"next-major",
23+
{ "name": "beta", "prerelease": true },
24+
{ "name": "alpha", "prerelease": true }
2125
]
2226
},
2327
"scripts": {

0 commit comments

Comments
 (0)