Skip to content

Commit 99865e5

Browse files
committed
Merge remote-tracking branch 'origin/main' into v2-merge-main
2 parents 141d9e8 + b11eb8d commit 99865e5

File tree

3 files changed

+54
-6
lines changed

3 files changed

+54
-6
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,8 @@ jobs:
258258
- host: macos-latest
259259
target: aarch64-apple-darwin
260260

261-
- host: windows-latest
261+
# Note: 2025 image breaks rollup
262+
- host: windows-2022
262263
target: x86_64-pc-windows-msvc
263264

264265
name: Build optimizer ${{ matrix.settings.target }}
@@ -665,8 +666,9 @@ jobs:
665666
# browser: firefox
666667
- host: macos-latest
667668
browser: webkit
668-
- host: windows-latest
669-
browser: chromium
669+
# flaky. Updating node version or sharp/sqlite3 related deps might help.
670+
# - host: windows-2022
671+
# browser: chromium
670672

671673
runs-on: ${{ matrix.settings.host }}
672674

@@ -712,7 +714,7 @@ jobs:
712714
run: pnpm run test.e2e.qwik-react.${{ matrix.settings.browser }} --timeout 60000 --retries 7 --workers 1
713715

714716
- name: Validate Create Qwik Cli
715-
if: matrix.settings.host != 'windows-latest'
717+
if: matrix.settings.host != 'windows-2022'
716718
run: pnpm cli.validate
717719

718720
############ E2E CLI TEST ############
@@ -730,7 +732,7 @@ jobs:
730732
settings:
731733
- host: ubuntu-latest
732734
- host: macos-latest
733-
- host: windows-latest
735+
- host: windows-2022
734736

735737
runs-on: ${{ matrix.settings.host }}
736738

e2e/docs-e2e/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "docs-e2e",
33
"description": "",
4-
"version": "1.0.0",
4+
"private": true,
55
"author": "",
66
"devDependencies": {
77
"@playwright/test": "1.54.1",

packages/docs/wrangler.jsonc

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/**
2+
* For more details on how to configure Wrangler, refer to:
3+
* https://developers.cloudflare.com/workers/wrangler/configuration/
4+
*/
5+
{
6+
"$schema": "node_modules/wrangler/config-schema.json",
7+
"name": "qwik-docs",
8+
"compatibility_date": "2025-09-27",
9+
"assets": {
10+
// The path to the directory containing the `index.html` file to be served at `/`
11+
"directory": "/dist",
12+
},
13+
"observability": {
14+
"enabled": true,
15+
},
16+
/**
17+
* Smart Placement
18+
* Docs: https://developers.cloudflare.com/workers/configuration/smart-placement/#smart-placement
19+
*/
20+
// "placement": { "mode": "smart" }
21+
/**
22+
* Bindings
23+
* Bindings allow your Worker to interact with resources on the Cloudflare Developer Platform, including
24+
* databases, object storage, AI inference, real-time communication and more.
25+
* https://developers.cloudflare.com/workers/runtime-apis/bindings/
26+
*/
27+
/**
28+
* Environment Variables
29+
* https://developers.cloudflare.com/workers/wrangler/configuration/#environment-variables
30+
*/
31+
// "vars": { "MY_VARIABLE": "production_value" }
32+
/**
33+
* Note: Use secrets to store sensitive data.
34+
* https://developers.cloudflare.com/workers/configuration/secrets/
35+
*/
36+
/**
37+
* Static Assets
38+
* https://developers.cloudflare.com/workers/static-assets/binding/
39+
*/
40+
// "assets": { "directory": "./public/", "binding": "ASSETS" }
41+
/**
42+
* Service Bindings (communicate between multiple Workers)
43+
* https://developers.cloudflare.com/workers/wrangler/configuration/#service-bindings
44+
*/
45+
// "services": [{ "binding": "MY_SERVICE", "service": "my-service" }]
46+
}

0 commit comments

Comments
 (0)