Skip to content

Commit

Permalink
Fix v4 release workflow (#14167)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
RobinMalfait authored Aug 9, 2024
1 parent f5f91ce commit 558dcd5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:

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

- name: Test
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,6 @@ jobs:
with:
node-version: ${{ env.NODE_VERSION }}

- name: Setup cross compile toolchain
if: ${{ matrix.setup }}
run: ${{ matrix.setup }}

- name: Install Rust (Stable)
if: ${{ matrix.download }}
run: |
Expand All @@ -130,7 +126,7 @@ jobs:
run: pnpm install --ignore-scripts --filter=!./playgrounds/*

- name: Build release
run: pnpm run build --filter ${{ env.OXIDE_LOCATION }}
run: pnpm run --filter ${{ env.OXIDE_LOCATION }} build
env:
RUST_TARGET: ${{ matrix.target }}
JEMALLOC_SYS_WITH_LG_PAGE: ${{ matrix.page-size }}
Expand Down Expand Up @@ -195,7 +191,7 @@ jobs:
key: ${{ runner.os }}-${{ matrix.target }}-oxide-${{ hashFiles('./crates/**/*') }}

- name: Install dependencies
run: pnpm install --ignore-scripts --filter=!./playgrounds/*
run: pnpm --filter=!./playgrounds/* install --ignore-scripts

- name: Build Tailwind CSS
run: pnpm run build
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
"scripts": {
"format": "prettier --write .",
"lint": "prettier --check . && turbo lint",
"build": "turbo build --filter=!./playgrounds/* && node ./scripts/pack-packages.mjs",
"build": "turbo build --filter=!./playgrounds/*",
"postbuild": "node ./scripts/pack-packages.mjs",
"dev": "turbo dev --filter=!./playgrounds/*",
"test": "cargo test && vitest run",
"test:integrations": "vitest --root=./integrations --no-file-parallelism",
Expand Down

0 comments on commit 558dcd5

Please sign in to comment.