diff --git a/roles/ever_node_compile/tasks/main.yml b/roles/ever_node_compile/tasks/main.yml index 55cb980..e4dccb6 100644 --- a/roles/ever_node_compile/tasks/main.yml +++ b/roles/ever_node_compile/tasks/main.yml @@ -89,11 +89,11 @@ executable: "/bin/bash" chdir: "{{ ever_node_src_dir }}/ever_node" -- name: EVER node change binary name - lineinfile: - path: "{{ ever_node_src_dir }}/ever_node/Cargo.toml" - regexp: '^name =' - line: "name = 'ever_node'" +#- name: EVER node change binary name +# lineinfile: +# path: "{{ ever_node_src_dir }}/ever_node/Cargo.toml" +# regexp: "^name = 'ton_node'" +# line: "name = 'ever_node'" - name: EVER node change release options blockinfile: @@ -110,15 +110,34 @@ regexp: '^log4rs =' line: "log4rs = { features = [ 'pattern_encoder', 'json_encoder' ], version = '1.2.0' }" -- name: Get EVER node tools sources +#- name: Get EVER node tools sources +# git: +# repo: "{{ ever_node_tools_github_repo }}" +# dest: "{{ ever_node_src_dir }}/ever_node_tools" +# version: "{{ ever_node_tools_github_commit_id }}" +# force: true +# register: ever_node_tools_sources + +#- name: Updating EVER node tools submodules +# shell: | +# set -euo pipefail +# git submodule init +# git submodule update --recursive +# git submodule foreach 'git submodule init' +# git submodule foreach 'git submodule update --recursive' +# args: +# executable: "/bin/bash" +# chdir: "{{ ever_node_src_dir }}/ever_node_tools" + +- name: Get ever-cli sources git: - repo: "{{ ever_node_tools_github_repo }}" - dest: "{{ ever_node_src_dir }}/ever_node_tools" - version: "{{ ever_node_tools_github_commit_id }}" + repo: "{{ ever_cli_github_repo }}" + dest: "{{ ever_node_src_dir }}/ever-cli" + version: "{{ ever_cli_github_commit_id }}" force: true - register: ever_node_tools_sources + register: ever_cli_sources -- name: Updating EVER node tools submodules +- name: Updating ever-cli submodules shell: | set -euo pipefail git submodule init @@ -127,26 +146,7 @@ git submodule foreach 'git submodule update --recursive' args: executable: "/bin/bash" - chdir: "{{ ever_node_src_dir }}/ever_node_tools" - -- name: Get tonos-cli sources - git: - repo: "{{ tonos_cli_github_repo }}" - dest: "{{ ever_node_src_dir }}/tonos_cli" - version: "{{ tonos_cli_github_commit_id }}" - force: true - register: tonos_cli_sources - -- name: Updating tonos-cli submodules - shell: | - set -euo pipefail - git submodule init - git submodule update --recursive - git submodule foreach 'git submodule init' - git submodule foreach 'git submodule update --recursive' - args: - executable: "/bin/bash" - chdir: "{{ ever_node_src_dir }}/tonos_cli" + chdir: "{{ ever_node_src_dir }}/ever-cli" - name: Get tvm linker sources git: @@ -186,25 +186,25 @@ ZSTD_LIB_DIR: "{% if ansible_pkg_mgr == 'dnf' %}/usr/local/lib{% elif ansible_pkg_mgr == 'apt' %}/usr/lib/x86_64-linux-gnu{% endif %}" PKG_CONFIG_PATH: "/usr/local/lib/pkgconfig" -- name: Build EVER node tools - block: - - name: Update repo deps | node tools - command: '{{ ansible_env.HOME }}/.cargo/bin/cargo update --manifest-path {{ ever_node_src_dir }}/ever_node_tools/Cargo.toml' - - name: Build repo | node tools - command: '{{ ansible_env.HOME }}/.cargo/bin/cargo build --manifest-path {{ ever_node_src_dir }}/ever_node_tools/Cargo.toml --target-dir {{ ever_node_src_dir }} --release' - when: ever_node_tools_sources.changed or ever_node_tools_force_recompile - environment: - RUSTFLAGS: "{{ rust_flags }}" - ZSTD_LIB_DIR: "{% if ansible_pkg_mgr == 'dnf' %}/usr/local/lib{% elif ansible_pkg_mgr == 'apt' %}/usr/lib/x86_64-linux-gnu{% endif %}" - PKG_CONFIG_PATH: "/usr/local/lib/pkgconfig" - -- name: Build tonos-cli +#- name: Build EVER node tools +# block: +# - name: Update repo deps | node tools +# command: '{{ ansible_env.HOME }}/.cargo/bin/cargo update --manifest-path {{ ever_node_src_dir }}/ever_node_tools/Cargo.toml' +# - name: Build repo | node tools +# command: '{{ ansible_env.HOME }}/.cargo/bin/cargo build --manifest-path {{ ever_node_src_dir }}/ever_node_tools/Cargo.toml --target-dir {{ ever_node_src_dir }} --release' +# when: ever_node_tools_sources.changed or ever_node_tools_force_recompile +# environment: +# RUSTFLAGS: "{{ rust_flags }}" +# ZSTD_LIB_DIR: "{% if ansible_pkg_mgr == 'dnf' %}/usr/local/lib{% elif ansible_pkg_mgr == 'apt' %}/usr/lib/x86_64-linux-gnu{% endif %}" +# PKG_CONFIG_PATH: "/usr/local/lib/pkgconfig" + +- name: Build ever-cli block: - - name: Update repo deps | tonos-cli - command: '{{ ansible_env.HOME }}/.cargo/bin/cargo update --manifest-path {{ ever_node_src_dir }}/tonos_cli/Cargo.toml' + - name: Update repo deps | ever-cli + command: '{{ ansible_env.HOME }}/.cargo/bin/cargo update --manifest-path {{ ever_node_src_dir }}/ever-cli/Cargo.toml' - name: Build repo | tonos cli - command: '{{ ansible_env.HOME }}/.cargo/bin/cargo build --manifest-path {{ ever_node_src_dir }}/tonos_cli/Cargo.toml --target-dir {{ ever_node_src_dir }} --release' - when: tonos_cli_sources.changed or tonos_cli_force_recompile + command: '{{ ansible_env.HOME }}/.cargo/bin/cargo build --manifest-path {{ ever_node_src_dir }}/ever-cli/Cargo.toml --target-dir {{ ever_node_src_dir }} --release' + when: ever_cli_sources.changed or ever_cli_force_recompile environment: RUSTFLAGS: "{{ rust_flags }}" ZSTD_LIB_DIR: "{% if ansible_pkg_mgr == 'dnf' %}/usr/local/lib{% elif ansible_pkg_mgr == 'apt' %}/usr/lib/x86_64-linux-gnu{% endif %}" diff --git a/roles/ever_node_deploy/tasks/main.yml b/roles/ever_node_deploy/tasks/main.yml index eeeea63..313dddf 100644 --- a/roles/ever_node_deploy/tasks/main.yml +++ b/roles/ever_node_deploy/tasks/main.yml @@ -17,9 +17,9 @@ - keygen - print - zerostate - when: ever_node_tools_sources.changed or ever_node_tools_force_recompile +# when: ever_node_tools_sources.changed or ever_node_tools_force_recompile -- name: Copy tonos-cli binaries +- name: Copy ever-cli binaries copy: src: "{{ ever_node_src_dir }}/release/tonos-cli" dest: "{{ ever_node_tools_dir }}" @@ -27,7 +27,7 @@ group: "{{ ever_node_group }}" mode: u=rwx,g=rx,o= remote_src: yes - when: tonos_cli_sources.changed or tonos_cli_force_recompile + when: ever_cli_sources.changed or ever_cli_force_recompile - name: Copy tvm linker binaries copy: @@ -41,8 +41,8 @@ - name: Copy ever node binaries copy: - src: "{{ ever_node_src_dir }}/release/ever_node" - dest: "{{ ever_node_bin_dir }}" + src: "{{ ever_node_src_dir }}/release/ton_node" + dest: "{{ ever_node_bin_dir }}/ever_node" owner: "{{ ever_node_user }}" group: "{{ ever_node_group }}" mode: u=rwx,g=rx,o= diff --git a/vars/ever_node.yml b/vars/ever_node.yml index 4846214..33ae328 100644 --- a/vars/ever_node.yml +++ b/vars/ever_node.yml @@ -33,7 +33,7 @@ ever_node_github_repo: "https://github.com/tonlabs/ever-node.git" ever_node_github_commit_id: "master" # Recompile binary without sources changes: false|true -ever_node_force_recompile: true +ever_node_force_recompile: false # Get everscale node tools commit id: https://github.com/tonlabs/ever-node-tools/commits" ever_node_tools_github_repo: "https://github.com/tonlabs/ever-node-tools.git" @@ -42,12 +42,12 @@ ever_node_tools_github_commit_id: "master" # Recompile binary without sources changes: false|true ever_node_tools_force_recompile: true -# Get tonos cli commit id: https://github.com/tonlabs/tonos-cli/commits" -tonos_cli_github_repo: "https://github.com/tonlabs/tonos-cli.git" -tonos_cli_github_commit_id: "master" +# Get ever-cli commit id: https://github.com/tonlabs/ever-cli/commits" +ever_cli_github_repo: "https://github.com/tonlabs/ever-cli.git" +ever_cli_github_commit_id: "master" # Recompile binary without sources changes: false|true -tonos_cli_force_recompile: true +ever_cli_force_recompile: false # Get TVM linker commit id: https://github.com/tonlabs/TVM-linker/commits" tvm_linker_github_repo: "https://github.com/tonlabs/TVM-linker.git" diff --git a/vars/system.yml b/vars/system.yml index e1c09e3..6c4c36d 100644 --- a/vars/system.yml +++ b/vars/system.yml @@ -54,7 +54,7 @@ zstd_version: 1.5.1 rustup_mirror : https://static.rust-lang.org/rustup/dist rustup_platform : x86_64-unknown-linux-gnu # Default rust version: stable|beta|nightly|| -rustup_default_toolchain: "1.70.0" +rustup_default_toolchain: "1.76.0" # Rust flags compile environment rust_flags: "-C target-cpu=native"