Skip to content

Commit

Permalink
Merge branch 'development' into feature-dan2
Browse files Browse the repository at this point in the history
# Conflicts:
#	Cargo.lock
#	applications/minotari_app_grpc/Cargo.toml
#	applications/minotari_app_grpc/src/conversions/sidechain_feature.rs
#	applications/minotari_app_utilities/Cargo.toml
#	applications/minotari_console_wallet/Cargo.toml
#	applications/minotari_console_wallet/src/grpc/wallet_grpc_server.rs
#	applications/minotari_merge_mining_proxy/Cargo.toml
#	applications/minotari_miner/Cargo.toml
#	applications/minotari_node/Cargo.toml
#	base_layer/common_types/Cargo.toml
#	base_layer/contacts/Cargo.toml
#	base_layer/core/Cargo.toml
#	base_layer/core/src/blocks/genesis_block.rs
#	base_layer/core/src/chain_storage/lmdb_db/lmdb_db.rs
#	base_layer/core/src/proto/sidechain_feature.rs
#	base_layer/core/src/transactions/transaction_components/side_chain/validator_node_signature.rs
#	base_layer/key_manager/Cargo.toml
#	base_layer/mmr/Cargo.toml
#	base_layer/p2p/Cargo.toml
#	base_layer/service_framework/Cargo.toml
#	base_layer/wallet/Cargo.toml
#	base_layer/wallet_ffi/Cargo.toml
#	common/Cargo.toml
#	common/tari_features/Cargo.toml
#	common_sqlite/Cargo.toml
#	comms/core/Cargo.toml
#	comms/dht/Cargo.toml
#	comms/rpc_macros/Cargo.toml
#	infrastructure/derive/Cargo.toml
#	infrastructure/shutdown/Cargo.toml
#	infrastructure/storage/Cargo.toml
#	infrastructure/test_utils/Cargo.toml
  • Loading branch information
stringhandler committed Nov 6, 2023
2 parents eba945a + 597b9ef commit fe787a5
Show file tree
Hide file tree
Showing 280 changed files with 9,008 additions and 11,277 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/base_node_binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,6 @@ jobs:
echo "PLATFORM_SPECIFIC_DIR=osx" >> $GITHUB_ENV
echo "LIB_EXT=.dylib" >> $GITHUB_ENV
# Hardcoded sdk for MacOSX 11 on ARM64
- name: Set environment variables - macOS - ARM64 (pin/sdk)
if: ${{ startsWith(runner.os,'macOS') && matrix.builds.name == 'macos-arm64' }}
run: |
xcrun --show-sdk-path
ls -la "/Library/Developer/CommandLineTools/SDKs/"
echo "RANDOMX_RS_CMAKE_OSX_SYSROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk" >> $GITHUB_ENV
rustup target add ${{ matrix.builds.target }}
- name: Set environment variables - Ubuntu
if: startsWith(runner.os,'Linux')
Expand Down
Loading

0 comments on commit fe787a5

Please sign in to comment.