Skip to content

Commit 558dcd5

Browse files
authored
Fix v4 release workflow (#14167)
This PR fixes the release workflow - We added a postbuild step so that any arguments/flags passed to the `pnpm run build` command are forwarded to the underlying command. - We made sure that we run any `pnpm` specific flags before the actual command - Cleaned up the CI workflow a bit
1 parent f5f91ce commit 558dcd5

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262

6363
- name: Lint
6464
run: pnpm run lint
65-
# Only lint on linux to avoind \r\n line ending errors
65+
# Only lint on linux to avoid \r\n line ending errors
6666
if: matrix.runner == 'ubuntu-latest'
6767

6868
- name: Test

.github/workflows/release.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,6 @@ jobs:
114114
with:
115115
node-version: ${{ env.NODE_VERSION }}
116116

117-
- name: Setup cross compile toolchain
118-
if: ${{ matrix.setup }}
119-
run: ${{ matrix.setup }}
120-
121117
- name: Install Rust (Stable)
122118
if: ${{ matrix.download }}
123119
run: |
@@ -130,7 +126,7 @@ jobs:
130126
run: pnpm install --ignore-scripts --filter=!./playgrounds/*
131127

132128
- name: Build release
133-
run: pnpm run build --filter ${{ env.OXIDE_LOCATION }}
129+
run: pnpm run --filter ${{ env.OXIDE_LOCATION }} build
134130
env:
135131
RUST_TARGET: ${{ matrix.target }}
136132
JEMALLOC_SYS_WITH_LG_PAGE: ${{ matrix.page-size }}
@@ -195,7 +191,7 @@ jobs:
195191
key: ${{ runner.os }}-${{ matrix.target }}-oxide-${{ hashFiles('./crates/**/*') }}
196192

197193
- name: Install dependencies
198-
run: pnpm install --ignore-scripts --filter=!./playgrounds/*
194+
run: pnpm --filter=!./playgrounds/* install --ignore-scripts
199195

200196
- name: Build Tailwind CSS
201197
run: pnpm run build

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
"scripts": {
3535
"format": "prettier --write .",
3636
"lint": "prettier --check . && turbo lint",
37-
"build": "turbo build --filter=!./playgrounds/* && node ./scripts/pack-packages.mjs",
37+
"build": "turbo build --filter=!./playgrounds/*",
38+
"postbuild": "node ./scripts/pack-packages.mjs",
3839
"dev": "turbo dev --filter=!./playgrounds/*",
3940
"test": "cargo test && vitest run",
4041
"test:integrations": "vitest --root=./integrations --no-file-parallelism",

0 commit comments

Comments
 (0)