Skip to content
Merged
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
3 changes: 2 additions & 1 deletion .JuliaFormatter.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ always_for_in = true
always_use_return = true
margin = 80
remove_extra_newlines = true
short_to_long_function_def = true
separate_kwargs_with_semicolon = true
short_to_long_function_def = true
5 changes: 2 additions & 3 deletions .github/workflows/format_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ name: format-check
on:
push:
branches:
- master
- release-*
- main
pull_request:
types: [opened, synchronize, reopened]
jobs:
Expand All @@ -18,7 +17,7 @@ jobs:
shell: julia --color=yes {0}
run: |
using Pkg
Pkg.add(PackageSpec(name="JuliaFormatter", version="1"))
Pkg.add(PackageSpec(name="JuliaFormatter", version="2"))
using JuliaFormatter
format(".", verbose=true)
out = String(read(Cmd(`git diff`)))
Expand Down
2 changes: 1 addition & 1 deletion src/iis.jl
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ function MOI.compute_conflict!(optimizer::Optimizer)
InfeasibilityData(
iis,
true,
NoData(),
NoData();
maybe_constraints = maybe_constraints,
),
)
Expand Down
Loading