Skip to content

Commit

Permalink
Merge branch 'master' into prusti-std
Browse files Browse the repository at this point in the history
  • Loading branch information
Aurel300 authored Apr 3, 2023
2 parents 67e96eb + 63a2322 commit 4716233
Show file tree
Hide file tree
Showing 297 changed files with 4,180 additions and 2,562 deletions.
2 changes: 0 additions & 2 deletions .cargo/config

This file was deleted.

5 changes: 5 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[unstable]
bindeps = true

[registries.crates-io]
protocol = "sparse"
2 changes: 2 additions & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ jobs:
run: python x.py test --all

- name: Rerun quick cargo tests, enabling debug dumps to cover more code
# Disabled because it causes CI to run out of disk space
if: false
run: python x.py test quick
env:
PRUSTI_DUMP_DEBUG_INFO: true
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ jobs:

# Build in release mode (but don't test) for macOS ARM
# See: https://stackoverflow.com/a/66875783/2491528
# Blocked by: https://github.com/viperproject/prusti-dev/issues/1193
# Blocked by: requires jni-rs version >=0.21 to avoid linking to the JVM at compilation time
build_macos_arm:
if: false
runs-on: macos-latest
if: false
steps:
- name: Check out the repo
uses: actions/checkout@v2
Expand All @@ -81,9 +81,11 @@ jobs:

- name: Build with cargo --release for arm64
run: |
SDKROOT=$(xcrun -sdk macosx --show-sdk-path) \
MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version) \
python x.py build --release --all --target=aarch64-apple-darwin
export SDKROOT=$(xcrun -sdk macosx --show-sdk-path)
export MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version)
python x.py build --release --target=aarch64-apple-darwin -p prusti-launch
python x.py build --release --target=aarch64-apple-darwin -p prusti-server
python x.py build --release --target=aarch64-apple-darwin -p prusti-contracts-build
- name: Package Prusti artifact
run: python x.py package release prusti_artifact
Expand Down
19 changes: 17 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ jobs:
# Test cargo-prusti on a collection of crates.
test-crates:
needs: [fmt-check, clippy-check, check-deps, smir-check, quick-tests]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
shard_index: [0, 1, 2, 3]
Expand All @@ -313,6 +313,21 @@ jobs:
with:
shared-key: "shared"
- name: Build with cargo --release
run: python x.py build --release --all
run: |
python x.py build --release -p prusti
python x.py build --release -p prusti-launch
python x.py build --release -p test-crates
- name: Test Prusti on a collection of crates
run: ./target/release/test-crates --fail-fast --num-shards=4 --shard-index=${{ matrix.shard_index }}

# Dummy job to specify the jobs that must pass before merging on master
can-merge:
runs-on: ubuntu-latest
needs: [all-tests, purification-tests, test-crates]
# Always run, even if the workflow was cancelled
if: ${{ always() }}
steps:
- name: Fail if the workflow failed or was cancelled
uses: re-actors/alls-green@release/v1
with:
jobs: ${{ toJSON(needs) }}
Loading

0 comments on commit 4716233

Please sign in to comment.