Skip to content

Commit

Permalink
Merge branch 'development' into stealth_addresses_clean
Browse files Browse the repository at this point in the history
  • Loading branch information
agubarev committed Jul 27, 2022
2 parents 909026f + 32569da commit b5b20b5
Show file tree
Hide file tree
Showing 200 changed files with 5,141 additions and 27,838 deletions.
2 changes: 0 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,9 @@ workflows:
branches:
ignore:
gh-pages
launchpad_such_wow # TODO: Remove this filter once the branch is merged into development
- run-ffi-integration-tests:
filters:
branches:
ignore:
gh-pages
launchpad_such_wow # TODO: Remove this filter once the branch is merged into development

4 changes: 0 additions & 4 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,3 @@ base_layer/wallet_ffi/build.config
base_layer/wallet_ffi/.cargo/config

keys.json

# Ignore docker files
applications/launchpad/docker_rig/*.Dockerfile
applications/launchpad/docker_rig/docker-compose.yml
1 change: 1 addition & 0 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
# Runs daily
---
name: Security audit

on:
Expand Down
59 changes: 59 additions & 0 deletions .github/workflows/base_node_binaries.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
[
{
"name": "linux-x86_64",
"runs-on": "ubuntu-18.04",
"rust": "nightly-2022-05-01",
"target": "x86_64-unknown-linux-gnu",
"cross": false,
"target_cpu": "x86-64",
"features": "safe"
},
{
"name": "linux-arm64",
"runs-on": "ubuntu-18.04",
"rust": "stable",
"target": "aarch64-unknown-linux-gnu",
"cross": false,
"target_cpu": "generic",
"target_bins": "--bin tari_base_node --bin tari_console_wallet --bin tari_merge_mining_proxy --bin tari_miner --bin tari_validator_node",
"features": "safe"
},
{
"name": "macos-x86_64",
"runs-on": "macos-11",
"rust": "stable",
"target": "x86_64-apple-darwin",
"cross": false,
"target_cpu": "x86-64",
"features": "safe"
},
{
"name": "macos-arm64",
"runs-on": "macos-latest",
"rust": "stable",
"target": "aarch64-apple-darwin",
"cross": true,
"target_cpu": "generic",
"features": "safe"
},
{
"name": "windows-x64",
"runs-on": "windows-2019",
"rust": "stable",
"target": "x86_64-pc-windows-msvc",
"cross": false,
"target_cpu": "x86-64",
"target_bins": "--bin tari_base_node --bin tari_console_wallet --bin tari_merge_mining_proxy --bin tari_miner --bin tari_validator_node",
"features": "safe"
},
{
"name": "windows-arm64",
"runs-on": "windows-latest",
"rust": "stable",
"target": "aarch64-pc-windows-msvc",
"cross": false,
"target_cpu": "generic",
"features": "safe",
"build_enabled": false
}
]
Loading

0 comments on commit b5b20b5

Please sign in to comment.