Skip to content

Commit 2fdbbdf

Browse files
authored
Merge pull request #14 from sgratzl/release/v3.6.0
Release v3.6.0
2 parents a8c412b + a6536f1 commit 2fdbbdf

29 files changed

+2267
-1676
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- uses: actions/checkout@v2
10-
- uses: actions/setup-node@v2.1.5
10+
- uses: actions/setup-node@v2
1111
with:
1212
node-version: 14
1313
- run: npm i -g yarn
14-
- run: yarn set version 2
15-
- run: cat .yarnrc_patch.yml >> .yarnrc.yml
1614
- run: yarn config set checksumBehavior ignore
1715
- name: Cache Node.js modules
18-
uses: actions/cache@v2.1.4
16+
uses: actions/cache@v2
1917
with:
20-
path: ./.yarn
21-
key: ${{ runner.os }}-yarn2-${{ hashFiles('**/yarn.lock') }}
18+
path: |
19+
./.yarn/cache
20+
./.yarn/unplugged
21+
key: ${{ runner.os }}-yarn2-v4-${{ hashFiles('**/yarn.lock') }}
2222
restore-keys: |
23-
${{ runner.os }}-yarn2-
23+
${{ runner.os }}-yarn2-v4
2424
- run: yarn install
2525
- run: yarn build
2626
- run: yarn lint

.github/workflows/create_release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ jobs:
3232
base: main
3333
title: Release ${{ steps.version.outputs.next_tag }}
3434
labels: chore
35-
reviewers: sgratzl
3635
assignees: sgratzl
3736
body: |
3837
Releasing ${{ steps.version.outputs.next_tag }}.

.github/workflows/release_helper.yml

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,20 @@ jobs:
4343
steps:
4444
- name: Check out code
4545
uses: actions/checkout@v2
46-
- uses: actions/setup-node@v2.1.5
46+
- uses: actions/setup-node@v2
4747
with:
4848
node-version: 14
4949
- run: npm i -g yarn
50-
- run: yarn set version 2
51-
- run: cat .yarnrc_patch.yml >> .yarnrc.yml
5250
- run: yarn config set checksumBehavior ignore
5351
- name: Cache Node.js modules
54-
uses: actions/cache@v2.1.4
52+
uses: actions/cache@v2
5553
with:
56-
path: ./.yarn
57-
key: ${{ runner.os }}-yarn2-${{ hashFiles('**/yarn.lock') }}
54+
path: |
55+
./.yarn/cache
56+
./.yarn/unplugged
57+
key: ${{ runner.os }}-yarn2-v4-${{ hashFiles('**/yarn.lock') }}
5858
restore-keys: |
59-
${{ runner.os }}-yarn2-
59+
${{ runner.os }}-yarn2-v4
6060
- run: yarn install
6161
- run: yarn build
6262
- run: yarn pack
@@ -85,17 +85,5 @@ jobs:
8585
- name: Reset dev branch
8686
run: |
8787
git fetch origin main:main
88-
git reset --hard main
89-
- name: Create pull request into dev
90-
uses: peter-evans/create-pull-request@v3
91-
with:
92-
token: ${{ secrets.PRIVATE_PAT }}
93-
branch: bot/sync-main-dev
94-
commit-message: 'chore: sync main-dev'
95-
base: dev
96-
title: 'chore: sync main->dev'
97-
labels: chore
98-
reviewers: sgratzl
99-
assignees: sgratzl
100-
body: |
101-
Syncing Main->Dev.
88+
git merge main
89+
git push

.gitignore

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@ npm-debug.log*
66
/coverage
77
/node_modules
88
.npm
9-
/.yarnrc.yml
10-
/.yarn
11-
/.pnp.*
9+
.yarn/*
10+
!.yarn/patches
11+
!.yarn/releases
12+
!.yarn/plugins
13+
!.yarn/versions
14+
.pnp.*
1215

1316
# Build files
1417
/.tmp

.prettierignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/.pnp.cjs
1+
/.pnp*
22
/.yarnrc.yml
33
/.yarn
44
/build

.release-it.json

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

.yarn/releases/yarn-3.1.0.cjs

Lines changed: 768 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
packageExtensions:
2+
eslint-module-utils@*:
3+
dependencies:
4+
eslint-import-resolver-node: "*"
5+
6+
yarnPath: .yarn/releases/yarn-3.1.0.cjs

.yarnrc_patch.yml

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

README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,8 @@ new BoxPlotChart(ctx, {
110110

111111
```sh
112112
npm i -g yarn
113-
yarn set version 2
114-
cat .yarnrc_patch.yml >> .yarnrc.yml
115113
yarn install
116-
yarn pnpify --sdk vscode
114+
yarn sdks vscode
117115
```
118116

119117
### Common commands
@@ -125,8 +123,6 @@ yarn lint
125123
yarn fix
126124
yarn build
127125
yarn docs
128-
yarn release
129-
yarn release:pre
130126
```
131127

132128
## Credits

0 commit comments

Comments
 (0)