From b3b03a75407515e715af0e7827040670a8adffbb Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Fri, 9 Aug 2024 19:30:08 +0200 Subject: [PATCH 1/6] add `postbuild` step This allows us to keep the `pnpm run build` an alias for `turbo`. Passing any flags to the `pnpm run build` command will correctly format it to the `turbo build` step. --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 5ff40218c5fe..6098451432d9 100644 --- a/package.json +++ b/package.json @@ -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", From f5d0dff5f15d3654f4cc859cd8f4a30b1aee89b7 Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Fri, 9 Aug 2024 19:31:52 +0200 Subject: [PATCH 2/6] move pnpm flags before actual command This way the flags are passed to `pnpm` itself instead of the underlying command. --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2cefce68e635..965f1dfa05ee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -130,7 +130,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 }} @@ -195,7 +195,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 From 2f5e04e4b45180a68c9824e011dadf90013de969 Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Fri, 9 Aug 2024 19:43:36 +0200 Subject: [PATCH 3/6] fix typo --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 81ab377b3eb8..294ab8af3783 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 From 166bb79a13a3c5821f19b1844aef126acc7737d4 Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Fri, 9 Aug 2024 19:34:31 +0200 Subject: [PATCH 4/6] remove unused step None of the items in the matrix have a `setup` step. We can just drop this now. --- .github/workflows/release.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 965f1dfa05ee..bc3f2ae21b82 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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: | From 449271300dc2aacc08e557d09198d93303c49c8e Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Fri, 9 Aug 2024 19:33:42 +0200 Subject: [PATCH 5/6] tmp: run dry release --- .github/workflows/release.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bc3f2ae21b82..225be332fc33 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,9 @@ name: Release on: + push: + branches: [master, next] + pull_request: workflow_dispatch: inputs: release_channel: @@ -135,11 +138,11 @@ jobs: if: ${{ matrix.strip }} run: ${{ matrix.strip }} ${{ env.OXIDE_LOCATION }}/*.node - - name: Upload artifacts - uses: actions/upload-artifact@v3 - with: - name: bindings-${{ matrix.target }} - path: ${{ env.OXIDE_LOCATION }}/*.node + # - name: Upload artifacts + # uses: actions/upload-artifact@v3 + # with: + # name: bindings-${{ matrix.target }} + # path: ${{ env.OXIDE_LOCATION }}/*.node release: runs-on: ubuntu-latest @@ -221,7 +224,7 @@ jobs: - name: Lock pre-release versions run: node ./scripts/lock-pre-release-versions.mjs - - name: Publish - run: pnpm --recursive publish --tag ${{ inputs.release_channel }} --no-git-checks - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + # - name: Publish + # run: pnpm --recursive publish --tag ${{ inputs.release_channel }} --no-git-checks + # env: + # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} From 697f6784b41e46c07bc499104e8c17a6227bd339 Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Fri, 9 Aug 2024 19:47:33 +0200 Subject: [PATCH 6/6] Revert "tmp: run dry release" This reverts commit 449271300dc2aacc08e557d09198d93303c49c8e. --- .github/workflows/release.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 225be332fc33..bc3f2ae21b82 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,9 +1,6 @@ name: Release on: - push: - branches: [master, next] - pull_request: workflow_dispatch: inputs: release_channel: @@ -138,11 +135,11 @@ jobs: if: ${{ matrix.strip }} run: ${{ matrix.strip }} ${{ env.OXIDE_LOCATION }}/*.node - # - name: Upload artifacts - # uses: actions/upload-artifact@v3 - # with: - # name: bindings-${{ matrix.target }} - # path: ${{ env.OXIDE_LOCATION }}/*.node + - name: Upload artifacts + uses: actions/upload-artifact@v3 + with: + name: bindings-${{ matrix.target }} + path: ${{ env.OXIDE_LOCATION }}/*.node release: runs-on: ubuntu-latest @@ -224,7 +221,7 @@ jobs: - name: Lock pre-release versions run: node ./scripts/lock-pre-release-versions.mjs - # - name: Publish - # run: pnpm --recursive publish --tag ${{ inputs.release_channel }} --no-git-checks - # env: - # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + - name: Publish + run: pnpm --recursive publish --tag ${{ inputs.release_channel }} --no-git-checks + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}