Skip to content

Commit f3892f7

Browse files
authored
Merge branch 'main' into CP-101/design-system-clack-implementation
2 parents 96cd7bf + a4b7449 commit f3892f7

File tree

4 files changed

+60
-12
lines changed

4 files changed

+60
-12
lines changed

.github/workflows/e2e-tests.yml

Lines changed: 50 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,62 @@ on:
1010
- cron: '0 1 * * *' # At 01:00 daily
1111

1212
jobs:
13-
e2e:
14-
name: E2E
13+
e2e-windows:
14+
name: E2E Windows tests
1515
runs-on: ${{ matrix.os }}
1616
timeout-minutes: 20
1717
env:
1818
DEBUG: true
1919
strategy:
2020
matrix:
21-
# TODO: E2E tests started failing on Windows. We should investigate the
22-
# root cause and add Windows back to the OS matrix:
23-
# https://github.com/netlify/cli/pull/6039
24-
#
25-
# os: [ubuntu-latest, macOS-latest, windows-latest]
21+
os: [windows-latest]
22+
node-version: ['18.14.0', '*']
23+
fail-fast: false
24+
25+
steps:
26+
- name: Git checkout
27+
uses: actions/checkout@v3
28+
with:
29+
fetch-depth: 0
30+
- name: Setup node
31+
uses: actions/setup-node@v3
32+
with:
33+
node-version: ${{ matrix.node-version }}
34+
cache: npm
35+
check-latest: true
36+
- name: Cache verdaccio storage
37+
uses: actions/cache@v3
38+
with:
39+
path: ./.verdaccio-storage
40+
key: verdaccio-e2e-cli-${{ hashFiles('./package-lock.json') }}
41+
- name: Install dependencies
42+
run: npm ci --no-audit
43+
- run: npm run e2e
44+
- name: Notify Slack
45+
uses: 8398a7/action-slack@v3
46+
if: ${{ github.event_name == 'schedule' && failure() }}
47+
with:
48+
status: custom
49+
fields: workflow
50+
custom_payload: |
51+
{
52+
attachments: [{
53+
title: 'E2E Test Failed! (${{ matrix.os }},node-${{ matrix.node-version }}',
54+
color: 'danger',
55+
text: `${process.env.AS_WORKFLOW}\n\nEither something broke or a test is flaky.\n\nConsider doing something about it :fire_engine:`,
56+
}]
57+
}
58+
env:
59+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
60+
61+
e2e-linux-based-os:
62+
name: E2E
63+
runs-on: ${{ matrix.os }}
64+
timeout-minutes: 10
65+
env:
66+
DEBUG: true
67+
strategy:
68+
matrix:
2669
os: [ubuntu-latest, macOS-latest]
2770
node-version: ['18.14.0', '*']
2871
fail-fast: false
@@ -45,8 +88,6 @@ jobs:
4588
key: verdaccio-e2e-cli-${{ hashFiles('./package-lock.json') }}
4689
- name: Install dependencies
4790
run: npm ci --no-audit
48-
- name: Install pnpm
49-
run: npm install -g pnpm
5091
- run: npm run e2e
5192
- name: Notify Slack
5293
uses: 8398a7/action-slack@v3

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
1313

1414

1515

16+
## [17.13.0](https://github.com/netlify/cli/compare/v17.12.0...v17.13.0) (2024-01-09)
17+
18+
19+
### Features
20+
21+
* pass feature flags down to netlify build on dev ([#6291](https://github.com/netlify/cli/issues/6291)) ([37ac46e](https://github.com/netlify/cli/commit/37ac46e2bc1e169733bd7d1c63a6e80ea00628ba))
22+
1623
## [17.12.0](https://github.com/netlify/cli/compare/v17.11.1...v17.12.0) (2024-01-08)
1724

1825

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "netlify-cli",
33
"description": "Netlify command line tool",
4-
"version": "17.12.0",
4+
"version": "17.13.0",
55
"author": "Netlify Inc.",
66
"type": "module",
77
"engines": {

0 commit comments

Comments
 (0)