Skip to content

Fix: do not rebuild ninja when building playground #8000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 2, 2025
+9 −3
Merged

Fix: do not rebuild ninja when building playground #8000

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ jobs:
upload_binaries: true
node-target: win32-x64
rust-target: x86_64-pc-windows-gnu
exe-suffix: ".exe"

# Verify that the compiler still builds with the oldest OCaml version we support.
- os: ubuntu-24.04
Expand Down Expand Up @@ -137,9 +138,9 @@ jobs:

- name: Copy rewatch binary
run: |
cp rewatch/target/${{ matrix.rust-target }}/release/rescript${{ runner.os == 'Windows' && '.exe' || '' }} rescript
cp rewatch/target/${{ matrix.rust-target }}/release/rescript${{ matrix.exe-suffix }} rescript
mkdir -p rewatch/target/release
cp rewatch/target/${{ matrix.rust-target }}/release/rescript${{ runner.os == 'Windows' && '.exe' || '' }} rewatch/target/release
cp rewatch/target/${{ matrix.rust-target }}/release/rescript${{ matrix.exe-suffix }} rewatch/target/release
./scripts/copyExes.js --rewatch
shell: bash

Expand Down Expand Up @@ -294,7 +295,7 @@ jobs:
id: ninja-build-cache
uses: actions/cache@v4
with:
path: ninja/ninja${{ runner.os == 'Windows' && '.exe' || '' }}
path: ninja/ninja${{ matrix.exe-suffix }}
key: ninja-build-v2-${{ matrix.os }}-${{ hashFiles('ninja/src/**') }}

- name: Setup Python for ninja build
Expand All @@ -319,6 +320,11 @@ jobs:
LDFLAGS: -static
run: node scripts/buildNinjaBinary.js

# Prevent ninja being rebuilt on playground build step later
- name: Touch ninja/ninja
if: ${{ matrix.build_playground && steps.ninja-build-cache.outputs.cache-hit == 'true' }}
run: touch ninja/ninja${{ matrix.exe-suffix }}

- name: Copy ninja exe to platform bin dir
run: node scripts/copyExes.js --ninja

Expand Down
Loading