Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 23 additions & 0 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,29 @@ jobs:
gc-max-store-size-linux: 2G
- run: nix develop -i .#bootstrap-check_4_08 -c make release

nix-build-ox:
# This builds OxCaml with the flake version which is typically ahead of the
# OxCaml opam repository
name: Build with OxCaml
strategy:
fail-fast: false
matrix:
os:
- ubuntu-latest
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v6
- uses: nixbuild/nix-quick-install-action@v34
with:
nix_conf: ${{ env.EXTRA_NIX_CONFIG }}
- uses: nix-community/cache-nix-action@v6
with:
primary-key: |
nix-${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/*.nix', '**/flake.lock') }}
restore-prefixes-first-match: nix-${{ runner.os }}-${{ github.job }}-
gc-max-store-size-linux: 2G
- run: nix develop -i .#bootstrap-ox -c make release

#
# Stage 2
#
Expand Down
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion otherlibs/stdune/src/fpath.ml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ let win32_unlink fn =
retry_loop 30)
;;

let unlink_exn = if Stdlib.Sys.win32 then win32_unlink else Unix.unlink
let unlink_exn = if Stdlib.Sys.win32 then win32_unlink else fun t -> Unix.unlink t

type unlink_status =
| Success
Expand Down
2 changes: 1 addition & 1 deletion src/csexp_rpc/csexp_rpc.ml
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ module Session = struct
let write t b =
match Platform.OS.value with
| Linux -> send t b
| _ -> Unix.single_write t b
| _ -> fun pos len -> Unix.single_write t b pos len
;;

let rec csexp_write_loop fd out_buf token =
Expand Down
2 changes: 1 addition & 1 deletion src/dune_stats/dune_stats.ml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ let global () = !global
let create ~extended_build_job_info dst =
let print =
match dst with
| Out out -> Stdlib.output_string out
| Out out -> fun str -> Stdlib.output_string out str
| Custom c -> c.write
in
let close =
Expand Down
Loading