diff --git a/tasks/build/go.yml b/tasks/build/go.yml index 13f90a1..2c96661 100644 --- a/tasks/build/go.yml +++ b/tasks/build/go.yml @@ -26,7 +26,7 @@ ansible.builtin.get_url: dest: "{{ d_go_dl_tmp.path }}/{{ go_archive }}" url: "https://go.dev/dl/{{ go_archive }}" - checksum: "{{ pkgconfig_go[pkgconfig_go.version][ansible_system][arch] }}" + checksum: "{{ pkgconfig_go.sums[pkgconfig_go.version][ansible_system][arch] }}" decompress: false - name: ensure go install dir exists diff --git a/tasks/build/neovim.yml b/tasks/build/neovim.yml index 931fad1..c8eeed0 100644 --- a/tasks/build/neovim.yml +++ b/tasks/build/neovim.yml @@ -21,8 +21,8 @@ CMAKE_BUILD_TYPE: "{{ pkgconfig_neovim.build_type }}" CMAKE_INSTALL_PREFIX: "{{ pkgconfig_neovim.install_prefix }}" target: install - become: "{{ pkgconfig_neovim.become }}" - become_user: "{% if pkgconfig_neovim.become %}{{ pkgconfig_neovim.owner }}{% else %}~{% endif %}" + become: "{{ pkgconfig_neovim.dobecome }}" + become_user: "{% if pkgconfig_neovim.dobecome %}{{ pkgconfig_neovim.owner }}{% else %}~{% endif %}" when: not pkgconfig_neovim.use_appimage - name: install neovim appimage @@ -50,5 +50,5 @@ path: "{{ pkgconfig_neovim.install_prefix }}/bin/nvim" when: - pkgconfig_neovim.use_appimage - become: "{{ pkgconfig_neovim.become }}" - become_user: "{% if pkgconfig_neovim.become %}{{ pkgconfig_neovim.owner }}{% else %}~{% endif %}" + become: "{{ pkgconfig_neovim.dobecome }}" + become_user: "{% if pkgconfig_neovim.dobecome %}{{ pkgconfig_neovim.owner }}{% else %}~{% endif %}" diff --git a/tasks/main.yml b/tasks/main.yml index c2a9be0..e18be32 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,52 +2,54 @@ - name: generate package installation lists ansible.builtin.include_tasks: file: addpkg.yml - loop: "{{ packages }}" + loop: "{{ packages | unique }}" loop_control: loop_var: pkg -- name: upgrade all packages +- name: redhat based OS block: - name: upgrade dnf packages ansible.builtin.dnf: name: "*" state: latest - when: ansible_os_family == 'RedHat' + become: true + when: full_upgrade + - name: install dnf packages + ansible.builtin.dnf: + name: "{{ syspkgs | unique }}" + state: "{{ install_state }}" + become: true + when: + - syspkgs|length > 0 + when: ansible_os_family == 'RedHat' + +- name: debian based OS + block: - name: upgrade apt packages ansible.builtin.apt: name: "*" state: latest - when: ansible_os_family == 'Debian' + become: true + when: full_upgrade + - name: install apt packages + ansible.builtin.apt: + name: "{{ syspkgs | unique }}" + state: "{{ install_state }}" + become: true + when: + - syspkgs|length > 0 + when: ansible_os_family == 'Debian' + +- name: darwin/macOS based OS + block: - name: upgrade homebrew packages community.general.homebrew: name: "*" state: latest - when: ansible_os_family == 'Darwin' - become: true - when: full_upgrade + when: full_upgrade -- name: Linux specific installation - block: - - name: install dnf packages - ansible.builtin.dnf: - name: "{{ syspkgs }}" - state: "{{ install_state }}" - when: ansible_os_family == 'RedHat' - - - name: install apt packages - ansible.builtin.apt: - name: "{{ syspkgs }}" - state: "{{ install_state }}" - when: ansible_os_family == 'Debian' - become: true - when: - - ansible_system == 'Linux' - - syspkgs|length > 0 - -- name: Macos specific installation - block: - name: tap homebrew taps community.general.homebrew_tap: name: "{{ brewtaps | unique }}" @@ -56,7 +58,7 @@ - name: install homebrew packages community.general.homebrew: - name: "{{ syspkgs }}" + name: "{{ syspkgs | unique }}" state: "{{ install_state }}" when: syspkgs|length > 0 @@ -69,15 +71,15 @@ - name: workaround to install homebrew taps ansible.builtin.command: cmd: "brew install {{ tappkg }}" - loop: "{{ tappkgs }}" + loop: "{{ tappkgs | unique }}" loop_control: loop_var: tappkg when: ansible_os_family == 'Darwin' - + - name: install srcpkgs ansible.builtin.include_tasks: file: "build/{{ srcpkg }}.yml" - loop: "{{ srcpkgs }}" + loop: "{{ srcpkgs | unique }}" loop_control: loop_var: srcpkg when: srcpkgs|length > 0 @@ -90,7 +92,7 @@ locked: "{{ cargopkg.locked | default(false) }}" become: true when: cargoversioned|length > 0 - loop: "{{ cargoversioned }}" + loop: "{{ cargoversioned | unique }}" loop_control: loop_var: cargopkg @@ -100,29 +102,27 @@ state: latest locked: "{{ cargopkg.locked | default(false) }}" when: cargopkgs|length > 0 - loop: "{{ cargopkgs }}" + loop: "{{ cargopkgs | unique }}" loop_control: loop_var: cargopkg - name: Install local npm packages - when: packages.npm is defined community.general.npm: global: true name: "{{ npmpkg }}" state: latest - loop: "{{ npmpkgs }}" + loop: "{{ npmpkgs | unique }}" loop_control: loop_var: npmpkg when: npmpkgs|length > 0 - name: Install local go packages - become: true environment: GOROOT: /usr/local/go PATH: /usr/local/go/bin:$PATH ansible.builtin.command: cmd: "go install {{ gopkg }}" - loop: "{{ gopkgs }}" + loop: "{{ gopkgs | unique }}" loop_control: loop_var: gopkg when: gopkgs|length > 0 @@ -131,7 +131,7 @@ ansible.builtin.pip: name: "{{ pipxpkg }}" state: latest - loop: "{{ pipxpkgs }}" + loop: "{{ pipxpkgs | unique }}" loop_control: loop_var: pipxpkg when: pipxpkgs|length > 0 diff --git a/vars/alacritty.yml b/vars/alacritty.yml index 5dff5b1..e4eec35 100644 --- a/vars/alacritty.yml +++ b/vars/alacritty.yml @@ -1,6 +1,6 @@ --- version: 0.15.0 -install_prefix: /usr/local +install_prefix: "{{ default_config.install_prefix }}" # variables that aren't really configuration build_deps: diff --git a/vars/go.yml b/vars/go.yml index e8a6d4e..9286e15 100644 --- a/vars/go.yml +++ b/vars/go.yml @@ -1,15 +1,23 @@ --- -version: 1.23.5 -install_path: /usr/local +version: 1.23.6 +install_path: "{{ default_config.install_prefix }}" # checksums by version and ansible_system -1.23.5: - Darwin: - arm64: sha256:f819ed94939e08a5016b9a607ec84ebbde6cb3fe59750c59d97aa300c3fd02df - amd64: sha256:d2b06bf0b8299e0187dfe2d8ad39bd3dd96a6d93fe4d1cfd42c7872452f4a0a2 - Linux: - amd64: sha256:cbcad4a6482107c7c7926df1608106c189417163428200ce357695cc7e01d091 - arm64: sha256:47c84d332123883653b70da2db7dd57d2a865921ba4724efcdf56b5da7021db0 +sums: + 1.23.6: + Darwin: + amd64: 7fa387c228b4dd69b518a5d9425638fa5c0d86ec8943de373e3802aff2e5b12a + arm64: a167758a44e08af6eddf844ed86a6acdbff1d3957248913bbca7ee4ef6ff07d0 + Linux: + amd64: 561c780e8f4a8955d32bf72e46af0b5ee5e0debe1e4633df9a03781878219202 + arm64: 561c780e8f4a8955d32bf72e46af0b5ee5e0debe1e4633df9a03781878219202 + 1.23.5: + Darwin: + amd64: d2b06bf0b8299e0187dfe2d8ad39bd3dd96a6d93fe4d1cfd42c7872452f4a0a2 + arm64: f819ed94939e08a5016b9a607ec84ebbde6cb3fe59750c59d97aa300c3fd02df + Linux: + amd64: cbcad4a6482107c7c7926df1608106c189417163428200ce357695cc7e01d091 + arm64: 47c84d332123883653b70da2db7dd57d2a865921ba4724efcdf56b5da7021db0 # maps used in variables archmap: diff --git a/vars/lua-language-server.yml b/vars/lua-language-server.yml index 7b5438b..64cfb6f 100644 --- a/vars/lua-language-server.yml +++ b/vars/lua-language-server.yml @@ -1,5 +1,5 @@ version: 3.13.5 -install_prefix: /usr/local +install_prefix: "{{ default_config.install_prefix }}" install_path: /opt/lua-language-server base_url: https://github.com/LuaLS/lua-language-server/releases/download sysmap: diff --git a/vars/neovide.yml b/vars/neovide.yml index 6a03f38..57941e7 100644 --- a/vars/neovide.yml +++ b/vars/neovide.yml @@ -1,6 +1,6 @@ --- version: 0.14.0 -install_prefix: /usr/local +install_prefix: "{{ default_config.install_prefix }}" #required variables git_repo: https://github.com/neovide/neovide.git diff --git a/vars/neovim.yml b/vars/neovim.yml index 68a0b00..07b9585 100644 --- a/vars/neovim.yml +++ b/vars/neovim.yml @@ -1,11 +1,11 @@ --- version: v0.10.3 -install_prefix: /usr/local +install_prefix: "{{ default_config.install_prefix }}" install_dir: /opt/nvim use_appimage: true use_syspkg: true build_type: Release -become: true +dobecome: true git_repo: https://github.com/neovim/neovim appimage_url_pfx: https://github.com/neovim/neovim/releases/download owner: root diff --git a/vars/packer.yml b/vars/packer.yml deleted file mode 100644 index 525bcac..0000000 --- a/vars/packer.yml +++ /dev/null @@ -1,6 +0,0 @@ -Darwin: - pkgs: - - hashicorp/tap/packer -Linux: - pkgs: - - packer diff --git a/vars/zig.yml b/vars/zig.yml index 6077a8d..7642cc3 100644 --- a/vars/zig.yml +++ b/vars/zig.yml @@ -1,6 +1,6 @@ --- version: 0.13.0 -install_prefix: /usr/local +install_prefix: "{{ default_config.install_prefix }}" install_path: /opt/zig base_url: https://ziglang.org/download sysmap: diff --git a/vars/zls.yml b/vars/zls.yml index 3d4c3e7..d0a67cb 100644 --- a/vars/zls.yml +++ b/vars/zls.yml @@ -1,6 +1,6 @@ --- version: 0.13.0 -install_prefix: /usr/local +install_prefix: "{{ default_config.install_prefix }}" install_path: /opt/zls base_url: https://builds.zigtools.org sysmap: