Skip to content

Commit

Permalink
Merge branch 'main' into mrhoodz-update-pandaCSS-v0.51.1
Browse files Browse the repository at this point in the history
  • Loading branch information
gioboa authored Feb 3, 2025
2 parents bf839d3 + 0a254ea commit f1b268d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
14 changes: 4 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ jobs:

- name: Install NPM Dependencies
run: |
corepack enable
# Ensure that the qwik binary gets made
mkdir -p packages/qwik/bindings/
pnpm install --frozen-lockfile
Expand Down Expand Up @@ -275,6 +274,7 @@ jobs:
node-version: 20.x
cache: 'pnpm'
registry-url: https://registry.npmjs.org/

- run: pnpm install
- if: matrix.settings.wasm
run: pnpm install wasm-pack
Expand Down Expand Up @@ -382,7 +382,6 @@ jobs:
uses: actions/checkout@v4

- uses: pnpm/action-setup@v4
if: needs.changes.outputs.build-others == 'true'
- name: Setup Node
if: needs.changes.outputs.build-others == 'true'
uses: actions/setup-node@v4
Expand All @@ -399,7 +398,7 @@ jobs:

- name: Install NPM Dependencies
if: needs.changes.outputs.build-others == 'true'
run: corepack pnpm install
run: pnpm install

- name: 'build: qwik-city & others'
if: needs.changes.outputs.build-others == 'true'
Expand Down Expand Up @@ -530,7 +529,7 @@ jobs:
cache: 'pnpm'
registry-url: https://registry.npmjs.org/

- run: corepack pnpm install --frozen-lockfile
- run: pnpm install --frozen-lockfile
- name: Build Qwik Insights
run: pnpm run build.packages.insights

Expand Down Expand Up @@ -583,7 +582,7 @@ jobs:
mv artifact-qwiklabs/vite packages/qwik-labs/vite
mv artifact-qwikreact/lib packages/qwik-react/lib
- run: corepack pnpm install --frozen-lockfile
- run: pnpm install --frozen-lockfile
- name: Build Qwik Docs
run: pnpm run build.packages.docs && echo ok > docs-build-completed.txt

Expand Down Expand Up @@ -626,7 +625,6 @@ jobs:
node-version: 20.x
cache: 'pnpm'
registry-url: https://registry.npmjs.org/
- run: corepack enable

- name: Download Build Artifacts
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -690,7 +688,6 @@ jobs:
node-version: 20.x
cache: 'pnpm'
registry-url: https://registry.npmjs.org/
- run: corepack enable

- name: Download Build Artifacts
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -747,7 +744,6 @@ jobs:
node-version: 20.x
cache: 'pnpm'
registry-url: https://registry.npmjs.org/
- run: corepack enable

- name: Download Build Artifacts
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -782,7 +778,6 @@ jobs:
node-version: 20.x
cache: 'pnpm'
registry-url: https://registry.npmjs.org/
- run: corepack enable

- run: pnpm install --frozen-lockfile

Expand Down Expand Up @@ -847,7 +842,6 @@ jobs:
node-version: 20.x
cache: 'pnpm'
registry-url: https://registry.npmjs.org/
- run: corepack enable

- name: Download Build Artifacts
uses: actions/download-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
"yarn": "please-use-pnpm",
"pnpm": ">=9.0.5"
},
"packageManager": "pnpm@9.0.5",
"packageManager": "pnpm@9.15.5",
"pnpm": {
"overrides": {
"typescript": "5.4.5",
Expand Down

0 comments on commit f1b268d

Please sign in to comment.