Skip to content
This repository was archived by the owner on Mar 30, 2025. It is now read-only.

Commit 027ceb6

Browse files
authored
Merge pull request #295 from staticdev/bugfix/remove-focal-in-favor-to-bookworm
Remove Ubuntu focal support
2 parents 12247f0 + 60f3dc7 commit 027ceb6

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.github/workflows/tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ jobs:
4646
- debian12
4747
- debian11
4848
- ubuntu2204
49-
- ubuntu2004
5049

5150
steps:
5251
- name: Check out the repository

meta/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ galaxy_info:
1717
- name: Ubuntu
1818
versions:
1919
- jammy
20-
- focal
2120

2221
galaxy_tags:
2322
- python

tasks/custom_facts.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
---
2+
# ansible incorrectly identified Debian bookworm as focal
3+
# https://github.com/ansible/ansible/issues/79733
24
- name: Set command path based on distribution
35
ansible.builtin.set_fact:
4-
pipx_path: "{{ '/usr/bin' if ansible_distribution_release == 'bookworm' else ansible_env.HOME + '/.local/bin' }}"
6+
pipx_path: "{{ '/usr/bin' if ansible_distribution_release == 'focal' or ansible_distribution_release == 'bookworm' else ansible_env.HOME + '/.local/bin' }}"

tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
name: pipx
2323
state: present
2424
become: true
25-
when: pipx_version_cmd is failed and ansible_distribution_release == 'bookworm'
25+
when: pipx_version_cmd is failed and (ansible_distribution_release == 'focal' or ansible_distribution_release == 'bookworm')
2626

2727
- name: Install pipx on non-Bookworm OS
2828
ansible.builtin.pip:
2929
name: pipx
3030
extra_args: --user
31-
when: pipx_version_cmd is failed and ansible_distribution_release != 'bookworm'
31+
when: pipx_version_cmd is failed and ansible_distribution_release != 'focal' and ansible_distribution_release != 'bookworm'
3232

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

0 commit comments

Comments
 (0)