Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@
set_fact:
cplusplus_devtoolset: "gcc-toolset-{{ DTSVER }}"

- name: Use new dts name on alma linux
when:
- ansible_os_family == 'RedHat'
- ansible_distribution == 'AlmaLinux'
- ansible_distribution_major_version|int >= 8
set_fact:
cplusplus_dts_rpms: "gcc-toolset-{{ DTSVER }}"

- name: Install development tools
when: ansible_os_family == 'RedHat' and development_groupinstall
package:
Expand Down Expand Up @@ -192,7 +200,9 @@
- (collections_enabled|bool
and ansible_distribution_major_version|int < 8) or
(DTSVER|int >= 9
and ansible_distribution_major_version|int == 8)
and ansible_distribution_major_version|int == 8) or
(DTSVER|int >= 9
and ansible_distribution == 'AlmaLinux')
tags:
- base_gcc

Expand Down Expand Up @@ -226,7 +236,9 @@
- (collections_enabled|bool
and ansible_distribution_major_version|int < 8) or
(DTSVER|int >= 9
and ansible_distribution_major_version|int == 8)
and ansible_distribution_major_version|int == 8) or
(DTSVER|int >= 9
and ansible_distribution == 'AlmaLinux')
tags:
- base_gcc
- notest
Expand All @@ -248,7 +260,9 @@
- (collections_enabled|bool
and ansible_distribution_major_version|int < 8) or
(DTSVER|int >= 9
and ansible_distribution_major_version|int == 8)
and ansible_distribution_major_version|int >= 8) or
(DTSVER|int >= 9
and ansible_distribution == 'AlmaLinux')
set_fact:
cmd_env: "source /opt/rh/{{ cplusplus_devtoolset }}/enable && "
tags:
Expand Down