Skip to content

Commit 65eca0c

Browse files
TheAlexLichterTheAlexLichter
authored
Merge branch 'dev' into fix/trailing-slash-false-nuxt-child-bug
2 parents 3aabd99 + c8e7397 commit 65eca0c

File tree

187 files changed

+6262
-2911
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+6262
-2911
lines changed

‎.circleci/config.yml renamed to ‎.circleci/config.disable.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
- attach-project
103103
- run:
104104
name: Security Audit
105-
command: yarn audit || true
105+
command: yarn run audit
106106

107107
build:
108108
executor: node
@@ -143,7 +143,7 @@ jobs:
143143
- attach-project
144144
- run:
145145
name: Unit Tests
146-
command: yarn test:unit --coverage && yarn coverage -F unit
146+
command: yarn test:unit --coverage
147147
environment:
148148
JEST_JUNIT_OUTPUT_NAME: unit.xml
149149
- store-test-results
@@ -163,7 +163,7 @@ jobs:
163163
sudo ln -s `pwd`/chrome-linux/chrome /bin/chromium
164164
- run:
165165
name: E2E Tests
166-
command: CHROME_PATH=/bin/chromium yarn test:e2e && yarn coverage -F e2e
166+
command: CHROME_PATH=/bin/chromium yarn test:e2e
167167
environment:
168168
JEST_JUNIT_OUTPUT_NAME: e2e.xml
169169
- store-test-results
@@ -191,7 +191,9 @@ workflows:
191191
# Manually release on release branches
192192
commit:
193193
jobs:
194-
- setup
194+
- setup:
195+
filters:
196+
<<: *release_branches
195197
- lint: { requires: [setup] }
196198
- audit: { requires: [setup] }
197199
- build: { requires: [setup] }
@@ -202,7 +204,7 @@ workflows:
202204
- release-commit:
203205
requires: [build, lint, lint-app, audit, test-dev, test-unit, test-e2e]
204206
filters:
205-
<<: *release_branches
207+
<<: *release_branches
206208

207209
# Release nightly builds on release branches
208210
nightly:

‎.github/_main.workflow

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

‎.github/workflows/nightly.yml

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
name: nightly
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 * * *'
6+
7+
jobs:
8+
nightly:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v2
12+
with:
13+
ref: 'refs/heads/dev'
14+
fetch-depth: 0 # All history
15+
- name: fetch tags
16+
run: git fetch --depth=1 origin "+refs/tags/*:refs/tags/*"
17+
- uses: actions/setup-node@v1
18+
with:
19+
node-version: 12
20+
registry-url: 'https://registry.npmjs.org'
21+
- name: install
22+
run: yarn --check-files --frozen-lockfile --non-interactive
23+
- name: lint
24+
run: yarn test:lint
25+
- name: audit
26+
run: yarn run audit
27+
- name: build
28+
run: yarn test:fixtures -i
29+
env:
30+
NODE_OPTIONS: "--max_old_space_size=4096"
31+
- name: lint app
32+
run: yarn lint:app
33+
- name: test dev
34+
run: yarn test:dev -w=2
35+
- name: test unit
36+
run: yarn test:unit
37+
- name: test e2e
38+
run: yarn test:e2e
39+
- name: bump version
40+
run: yarn lerna version --yes --no-changelog --no-git-tag-version --no-push --force-publish "*" --loglevel verbose
41+
- name: build
42+
run: PACKAGE_SUFFIX=edge yarn build
43+
- name: publish
44+
run: ./scripts/workspace-run npm publish -q
45+
env:
46+
NODE_AUTH_TOKEN: ${{secrets.NODE_AUTH_TOKEN}}
47+
48+
# Anchors still not supported :(
49+
# https://github.community/t5/GitHub-Actions/Support-for-YAML-anchors/td-p/30336
50+
nightly-next:
51+
runs-on: ubuntu-latest
52+
steps:
53+
- uses: actions/checkout@v2
54+
with:
55+
ref: 'refs/heads/next'
56+
fetch-depth: 0 # All history
57+
- name: fetch tags
58+
run: git fetch --depth=1 origin "+refs/tags/*:refs/tags/*"
59+
- uses: actions/setup-node@v1
60+
with:
61+
node-version: 12
62+
registry-url: 'https://registry.npmjs.org'
63+
- name: install
64+
run: yarn --check-files --frozen-lockfile --non-interactive
65+
- name: lint
66+
run: yarn test:lint
67+
- name: audit
68+
run: yarn run audit
69+
- name: build
70+
run: yarn test:fixtures -i
71+
env:
72+
NODE_OPTIONS: "--max_old_space_size=4096"
73+
- name: lint app
74+
run: yarn lint:app
75+
- name: test dev
76+
run: yarn test:dev -w=2
77+
- name: test unit
78+
run: yarn test:unit
79+
- name: test e2e
80+
run: yarn test:e2e
81+
- name: bump version
82+
run: yarn lerna version --yes --no-changelog --no-git-tag-version --no-push --force-publish "*" --loglevel verbose
83+
- name: build
84+
run: PACKAGE_SUFFIX=edge yarn build
85+
- name: publish
86+
run: ./scripts/workspace-run npm publish --tag next -q
87+
env:
88+
NODE_AUTH_TOKEN: ${{secrets.NODE_AUTH_TOKEN}}
89+
90+

0 commit comments

Comments
 (0)