Skip to content

Commit

Permalink
Defork croaring (#3596)
Browse files Browse the repository at this point in the history
* Defork croaring

* Attempt to fix Windows CI

* Fix windows-release.yml too

* Use ROARING_ARCH=x86-64-v2
  • Loading branch information
trevyn authored Mar 22, 2021
1 parent 302c8ec commit 431e4b9
Show file tree
Hide file tree
Showing 7 changed files with 72 additions and 44 deletions.
5 changes: 4 additions & 1 deletion .ci/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ steps:
- script: 'cargo test --all'
displayName: Cargo Test All
condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['CI_JOB'], 'release' ))
- script: 'cargo build --release'
- script: |
cargo clean
ROARING_ARCH=x86-64-v2
cargo build --release
displayName: Build Release
condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['CI_JOB'], 'release' ))
- script: |
Expand Down
10 changes: 7 additions & 3 deletions .ci/test.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
steps:
- script: |
refreshenv && cargo test --all
refreshenv
LIBCLANG_PATH=C:\Program Files\LLVM\lib
LLVM_CONFIG_PATH=C:\Program Files\LLVM\bin\llvm-config
ROARING_ARCH=x86-64-v2
cargo test --all
displayName: Windows Cargo Test
condition: and(eq( variables['Agent.OS'], 'Windows_NT' ), eq( variables['CI_JOB'], 'test-all' ))
- script: 'cargo test --all'
- script: 'ROARING_ARCH=x86-64-v2 cargo test --all'
displayName: macOS Cargo Test
condition: and(eq( variables['Agent.OS'], 'Darwin' ), eq( variables['CI_JOB'], 'test-all' ))
- script: '.ci/general-jobs'
- script: 'ROARING_ARCH=x86-64-v2 .ci/general-jobs'
displayName: Linux Cargo Test
condition: eq( variables['Agent.OS'], 'Linux' )
13 changes: 11 additions & 2 deletions .ci/windows-release.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
steps:
- script: |
refreshenv && cargo test --all
refreshenv
LIBCLANG_PATH=C:\Program Files\LLVM\lib
LLVM_CONFIG_PATH=C:\Program Files\LLVM\bin\llvm-config
ROARING_ARCH=x86-64-v2
cargo test --all
displayName: Cargo Test All
condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['CI_JOB'], 'release' ))
- script: |
refreshenv && cargo build --release
cargo clean
refreshenv
LIBCLANG_PATH=C:\Program Files\LLVM\lib
LLVM_CONFIG_PATH=C:\Program Files\LLVM\bin\llvm-config
ROARING_ARCH=x86-64-v2
cargo build --release
displayName: Build Release
condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['CI_JOB'], 'release' ))
- script: |
Expand Down
82 changes: 47 additions & 35 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion chain/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ bitflags = "1"
byteorder = "1"
failure = "0.1"
failure_derive = "0.1"
croaring = { version = "0.4.5", package = "croaring-mw", features = ["compat"] }
croaring = "0.4.6"
enum_primitive = "0.1"
log = "0.4"
serde = "1"
Expand Down
2 changes: 1 addition & 1 deletion core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ edition = "2018"
[dependencies]
blake2 = { package = "blake2-rfc", version = "0.2"}
byteorder = "1"
croaring = { version = "0.4.5", package = "croaring-mw", features = ["compat"] }
croaring = "0.4.6"
enum_primitive = "0.1"
failure = "0.1"
failure_derive = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ edition = "2018"

[dependencies]
byteorder = "1"
croaring = { version = "0.4.5", package = "croaring-mw", features = ["compat"] }
croaring = "0.4.6"
libc = "0.2"
failure = "0.1"
failure_derive = "0.1"
Expand Down

0 comments on commit 431e4b9

Please sign in to comment.