From 2702b7d9f8a766cbd5934d6b822cd5ad785ba16a Mon Sep 17 00:00:00 2001 From: Andrii Date: Wed, 11 Dec 2024 12:21:28 +0200 Subject: [PATCH] refactor vars --- ansible1/roles/packages/tasks/main.yml | 8 ++++---- ansible1/roles/packages/vars/main.yml | 16 +++++++--------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/ansible1/roles/packages/tasks/main.yml b/ansible1/roles/packages/tasks/main.yml index 5f3b6b8e8..e5b43efaa 100644 --- a/ansible1/roles/packages/tasks/main.yml +++ b/ansible1/roles/packages/tasks/main.yml @@ -15,10 +15,10 @@ - name: Include OS-specific variables. include_vars: "{{ ansible_os_family }}.yml" -- name: Define ruby_build_packages - set_fact: - ruby_build_packages: "{{ __ruby_build_packages }}" - when: ruby_build_packages is not defined +# - name: Define ruby_build_packages +# set_fact: +# ruby_build_packages: "{{ __ruby_build_packages }}" +# when: ruby_build_packages is not defined - name: Update apt cache (Debian) apt: update_cache=true cache_valid_time=86400 diff --git a/ansible1/roles/packages/vars/main.yml b/ansible1/roles/packages/vars/main.yml index 82b6c19d2..9a46d435d 100644 --- a/ansible1/roles/packages/vars/main.yml +++ b/ansible1/roles/packages/vars/main.yml @@ -19,8 +19,6 @@ ruby_packages: - nodejs - yarn - libvips -ruby_build_packages: - - build-essential - zlib1g-dev - libssl-dev - libyaml-dev @@ -32,20 +30,20 @@ ruby_build_packages: rvm_dependencies: - curl - gnupg - - build-essential - - libssl-dev - - libyaml-dev + # - build-essential + # - libssl-dev + # - libyaml-dev - libreadline-dev - - zlib1g-dev + # - zlib1g-dev - libsqlite3-dev - sqlite3 - libxml2-dev - libxslt1-dev - libcurl4-openssl-dev - software-properties-common - - libffi-dev - - nodejs - - yarn + # - libffi-dev + # - nodejs + # - yarn ruby_rubygems_package_name: rubygems ruby_download_url: https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.xz workspace: /root