Skip to content

Commit

Permalink
Merge pull request #152 from spacemeshos/bump-randomx
Browse files Browse the repository at this point in the history
Bump randomx-rs, don't override Mac SDK with old 12.3
  • Loading branch information
poszu authored Nov 23, 2023
2 parents c420c42 + 0b8eb36 commit bf933e5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 19 deletions.
16 changes: 0 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,26 +71,17 @@ jobs:
run: cargo test --all-features --release -p post-rs -p certifier -p service
env:
RUSTFLAGS: ${{ matrix.rustflags }}
# https://github.com/tevador/RandomX/issues/262
# https://github.com/tari-project/randomx-rs/issues/48
SDKROOT: "/Library/Developer/CommandLineTools/SDKs/MacOSX12.3.sdk"

- name: Test scrypt-ocl crate
if: matrix.os != 'windows-2019'
run: cargo test -p scrypt-ocl --all-features --release -- --test-threads=1
env:
RUSTFLAGS: ${{ matrix.rustflags }}
# https://github.com/tevador/RandomX/issues/262
# https://github.com/tari-project/randomx-rs/issues/48
SDKROOT: "/Library/Developer/CommandLineTools/SDKs/MacOSX12.3.sdk"

- name: Test ffi crate
run: cargo test -p post-cbindings --all-features --release -- --test-threads=1
env:
RUSTFLAGS: ${{ matrix.rustflags }}
# https://github.com/tevador/RandomX/issues/262
# https://github.com/tari-project/randomx-rs/issues/48
SDKROOT: "/Library/Developer/CommandLineTools/SDKs/MacOSX12.3.sdk"

fmt:
name: Rustfmt
Expand Down Expand Up @@ -222,9 +213,6 @@ jobs:
run: cargo build -p post-cbindings --profile release-clib
env:
RUSTFLAGS: ${{ matrix.rustflags }}
# https://github.com/tevador/RandomX/issues/262
# https://github.com/tari-project/randomx-rs/issues/48
SDKROOT: "/Library/Developer/CommandLineTools/SDKs/MacOSX12.3.sdk"
- name: Archive production artifacts
uses: actions/upload-artifact@v3
with:
Expand All @@ -239,9 +227,6 @@ jobs:
run: cargo build -p profiler --release
env:
RUSTFLAGS: ${{ matrix.rustflags }}
# https://github.com/tevador/RandomX/issues/262
# https://github.com/tari-project/randomx-rs/issues/48
SDKROOT: "/Library/Developer/CommandLineTools/SDKs/MacOSX12.3.sdk"
- name: Archive profiler artifacts
uses: actions/upload-artifact@v3
with:
Expand All @@ -257,7 +242,6 @@ jobs:
run: cargo build -p service --release
env:
RUSTFLAGS: ${{ matrix.rustflags }}
SDKROOT: "/Library/Developer/CommandLineTools/SDKs/MacOSX12.3.sdk"
- name: Archive service artifacts
uses: actions/upload-artifact@v3
with:
Expand Down
4 changes: 2 additions & 2 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 Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ bitvec = "1.0.1"
rayon = "1.6.1"
rand = "0.8.5"
log = "0.4.17"
randomx-rs = { git = "https://github.com/spacemeshos/randomx-rs", rev = "6f2bf32af7219a5f9ae929c3020242ecc7c6dd6a" }
randomx-rs = { git = "https://github.com/spacemeshos/randomx-rs", rev = "d46bcd90e09428883e253b8203d6b311b0a07b91" }


primitive-types = "0.12.1"
Expand Down

0 comments on commit bf933e5

Please sign in to comment.