Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Ubuntu focal support #295

Merged
merged 1 commit into from
Jan 9, 2024
Merged

Remove Ubuntu focal support #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
- debian12
- debian11
- ubuntu2204
- ubuntu2004

steps:
- name: Check out the repository
Expand Down
1 change: 0 additions & 1 deletion meta/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ galaxy_info:
- name: Ubuntu
versions:
- jammy
- focal

galaxy_tags:
- python
Expand Down
4 changes: 3 additions & 1 deletion tasks/custom_facts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
---
# ansible incorrectly identified Debian bookworm as focal
# https://github.com/ansible/ansible/issues/79733
- name: Set command path based on distribution
ansible.builtin.set_fact:
pipx_path: "{{ '/usr/bin' if ansible_distribution_release == 'bookworm' else ansible_env.HOME + '/.local/bin' }}"
pipx_path: "{{ '/usr/bin' if ansible_distribution_release == 'focal' or ansible_distribution_release == 'bookworm' else ansible_env.HOME + '/.local/bin' }}"
4 changes: 2 additions & 2 deletions tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
name: pipx
state: present
become: true
when: pipx_version_cmd is failed and ansible_distribution_release == 'bookworm'
when: pipx_version_cmd is failed and (ansible_distribution_release == 'focal' or ansible_distribution_release == 'bookworm')

- name: Install pipx on non-Bookworm OS
ansible.builtin.pip:
name: pipx
extra_args: --user
when: pipx_version_cmd is failed and ansible_distribution_release != 'bookworm'
when: pipx_version_cmd is failed and ansible_distribution_release != 'focal' and ansible_distribution_release != 'bookworm'

- name: Check if pre-commit is installed
ansible.builtin.command: "{{ ansible_env.HOME }}/.local/bin/pre-commit --version"
Expand Down