Skip to content

Commit

Permalink
Merge pull request #166 from scipopt/update-scipsys
Browse files Browse the repository at this point in the history
Update scip-sys
  • Loading branch information
mmghannam authored Oct 27, 2024
2 parents e76314b + f198ffa commit f2372b1
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 24 deletions.
52 changes: 30 additions & 22 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ jobs:
- name: Run cargo-tarpaulin
uses: actions-rs/[email protected]
with:
version: '0.15.0'
args: '--verbose --all --out Xml'
version: "0.15.0"
args: "--verbose --all --out Xml"

- name: Upload to codecov.io
uses: codecov/codecov-action@v2
Expand Down Expand Up @@ -62,27 +62,35 @@ jobs:
- name: Test
run: |
rustup toolchain install nightly
rustup toolchain install nightly
RUSTFLAGS=-Zsanitizer=leak cargo +nightly test --features raw
# TODO: make this work with a manual run of the action
# publish-crate:
# needs:
# - linux-conda-test
# - test-with-coverage
# - windows-test
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v3
# - uses: actions-rs/toolchain@v1
# with:
# toolchain: stable
# override: true
# - name: publish crate
# uses: katyo/publish-crates@v2
# if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
# with:
# registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}
linux-bundled-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Test
run: |
cargo test --features bundled
# TODO: make this work with a manual run of the action
# publish-crate:
# needs:
# - linux-conda-test
# - test-with-coverage
# - windows-test
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v3
# - uses: actions-rs/toolchain@v1
# with:
# toolchain: stable
# override: true
# - name: publish crate
# uses: katyo/publish-crates@v2
# if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
# with:
# registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}

windows-test:
env:
Expand Down Expand Up @@ -130,4 +138,4 @@ jobs:
components: clippy
- uses: Swatinem/rust-cache@v2
- name: Check Clippy Linter
run: cargo clippy --all-features --all-targets -- -D warnings
run: cargo clippy --all-features --all-targets -- -D warnings
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ bundled = ["scip-sys/bundled"]
from-source = ["scip-sys/from-source"]

[dependencies]
scip-sys = "0.1.12"
scip-sys = "0.1.14"

[dev-dependencies]
rayon = "1.5.1"

[lints.clippy]
too_many_arguments = "allow"
too_many_arguments = "allow"

0 comments on commit f2372b1

Please sign in to comment.