Skip to content

Commit

Permalink
fix(build): remove tari_validator_node from binary builds (#4518)
Browse files Browse the repository at this point in the history
Description
Removed tari_validator_node from binary build process, solves build issues.

Motivation and Context
---

How Has This Been Tested?
Building in local fork
  • Loading branch information
leet4tari authored Aug 23, 2022
1 parent bdb262c commit 6df9cc8
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 12 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/base_node_binaries.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@
},
{
"name": "linux-arm64",
"runs-on": "ubuntu-18.04",
"runs-on": "ubuntu-latest",
"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"
},
{
Expand Down Expand Up @@ -43,7 +42,6 @@
"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"
},
{
Expand All @@ -54,6 +52,7 @@
"cross": false,
"target_cpu": "generic",
"features": "safe",
"target_bins": "--bin tari_base_node --bin tari_console_wallet --bin tari_merge_mining_proxy --bin tari_miner",
"build_enabled": false
}
]
2 changes: 0 additions & 2 deletions .github/workflows/base_node_binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,6 @@ jobs:
"tari_console_wallet"
"tari_miner"
"tari_merge_mining_proxy"
"tari_validator_node"
)
for FILE in "${FILES[@]}"; do
if [ -f "$GITHUB_WORKSPACE/target/${{ matrix.builds.target }}/release/${FILE}${TBN_EXT}" ]; then
Expand Down Expand Up @@ -274,7 +273,6 @@ jobs:
"tari_console_wallet"
"tari_miner"
"tari_merge_mining_proxy"
"tari_validator_node"
)
for FILE in "${FILES[@]}"; do
codesign --options runtime --force --verify --verbose --timestamp --sign "Developer ID Application: $MACOS_APPLICATION_ID" "/tmp/tari_testnet/runtime/$FILE"
Expand Down
3 changes: 0 additions & 3 deletions buildtools/create_osx_install_zip.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ cp -f "${app_dir}/tari_merge_mining_proxy/osx/runtime/start_tari_merge_mining_pr
cp -f "${app_dir}/tari_merge_mining_proxy/osx/runtime/start_xmrig.sh" "${tarball_folder}/runtime/start_xmrig.sh"
cp -f "${project_dir}/${target_release}/tari_merge_mining_proxy" "${tarball_folder}/runtime/tari_merge_mining_proxy"

# Validator node
cp -f "${project_dir}/${target_release}/tari_validator_node" "${tarball_folder}/runtime/tari_validator_node"

# 3rd party install
cp -f "${local_dir}/install_xmrig.sh" "${tarball_folder}/runtime/install_xmrig.sh"
cp -f "${local_dir}/get_xmrig_osx.ps1" "${tarball_folder}/runtime/get_xmrig_osx.ps1"
Expand Down
3 changes: 0 additions & 3 deletions buildtools/create_ubuntu_install_zip.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@ cp -f "${app_dir}/tari_merge_mining_proxy/linux/runtime/start_tari_merge_mining_
cp -f "${app_dir}/tari_merge_mining_proxy/linux/runtime/start_xmrig.sh" "${tarball_folder}/runtime/start_xmrig.sh"
cp -f "${project_dir}/${target_release}/tari_merge_mining_proxy" "${tarball_folder}/runtime/tari_merge_mining_proxy"

# Validator node
cp -f "${project_dir}/${target_release}/tari_validator_node" "${tarball_folder}/runtime/tari_validator_node"

# 3rd party install
cp -f "${local_dir}/install_xmrig.sh" "${tarball_folder}/runtime/install_xmrig.sh"
cp -f "${local_dir}/get_xmrig_ubuntu.ps1" "${tarball_folder}/runtime/get_xmrig_ubuntu.ps1"
Expand Down
1 change: 0 additions & 1 deletion buildtools/windows_inno_installer.iss
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ Source: "{#TariSuitePath}\tari_base_node.exe"; DestDir: "{app}\runtime"; Flags:
Source: "{#TariSuitePath}\tari_console_wallet.exe"; DestDir: "{app}\runtime"; Flags: ignoreversion
Source: "{#TariSuitePath}\tari_miner.exe"; DestDir: "{app}\runtime"; Flags: ignoreversion
Source: "{#TariSuitePath}\tari_merge_mining_proxy.exe"; DestDir: "{app}\runtime"; Flags: ignoreversion
Source: "{#TariSuitePath}\tari_validator_node.exe"; DestDir: "{app}\runtime"; Flags: ignoreversion
Source: "..\applications\tari_base_node\windows\runtime\start_all.bat"; DestDir: "{app}\runtime"; Flags: ignoreversion
Source: "..\applications\tari_base_node\windows\runtime\start_tor.bat"; DestDir: "{app}\runtime"; Flags: ignoreversion
Source: "..\applications\tari_base_node\windows\runtime\source_base_node_env.bat"; DestDir: "{app}\runtime"; Flags: ignoreversion
Expand Down

0 comments on commit 6df9cc8

Please sign in to comment.