Skip to content

Commit ea99174

Browse files
Merge pull request #5 from darkwizard242/feature/refactoring
Set tasks fqmn, update action versions and matrixes
2 parents e5389e0 + 204ed8a commit ea99174

File tree

8 files changed

+23
-21
lines changed

8 files changed

+23
-21
lines changed

.github/workflows/build-and-test.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ jobs:
2121
code_quality:
2222

2323
name: SonarCloud Code Quality Check
24-
runs-on: ubuntu-20.04
24+
runs-on: ubuntu-22.04
2525

2626
steps:
2727

2828
- name: Checkout source code
29-
uses: actions/checkout@v2
29+
uses: actions/checkout@v3
3030
with:
3131
path: 'darkwizard242.uget'
3232
fetch-depth: 0
@@ -45,23 +45,23 @@ jobs:
4545
build:
4646

4747
name: Build & Test
48-
runs-on: ubuntu-20.04
48+
runs-on: ubuntu-22.04
4949
strategy:
5050
max-parallel: 6
5151
matrix:
52-
IMAGE: [ubuntu-20.04, ubuntu-18.04, centos-7, debian-buster]
52+
IMAGE: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, centos-7, debian-bullseye, debian-buster]
5353

5454
steps:
5555

5656
- name: Checkout source code
57-
uses: actions/checkout@v2
57+
uses: actions/checkout@v3
5858
with:
5959
path: 'darkwizard242.uget'
6060

61-
- name: Set up Python 3.10.0
62-
uses: actions/setup-python@v2
61+
- name: Set up Python 3.10
62+
uses: actions/setup-python@v3
6363
with:
64-
python-version: 3.10.0
64+
python-version: '3.10'
6565

6666
- name: Update repo cache, install python3-setuptools and required pip modules
6767
run: |

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ jobs:
1010
release:
1111

1212
name: Release
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-22.04
1414

1515
steps:
1616

1717
- name: Checkout source code
18-
uses: actions/checkout@v2
18+
uses: actions/checkout@v3
1919
with:
2020
path: 'darkwizard242.uget'
2121

22-
- name: Set up Python 3.10.0
23-
uses: actions/setup-python@v2
22+
- name: Set up Python 3.10
23+
uses: actions/setup-python@v3
2424
with:
25-
python-version: 3.10.0
25+
python-version: '3.10'
2626

2727
- name: Update repo cache, install python3-setuptools and required pip modules
2828
run: |

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2022 Ali Muhammad
3+
Copyright (c) 2023 Ali Muhammad
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

meta/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ galaxy_info:
1010
platforms:
1111
- name: Ubuntu
1212
versions:
13-
- bionic
13+
- jammy
1414
- focal
15+
- bionic
1516
- name: Debian
1617
versions:
18+
- bullseye
1719
- buster
1820
- name: EL
1921
versions:

molecule/default/molecule.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ lint: |
88
ansible-lint
99
flake8
1010
platforms:
11-
- name: ${DISTRO:-ubuntu-20.04}
12-
image: "darkwizard242/ansible:${DISTRO:-ubuntu-20.04}"
11+
- name: ${DISTRO:-ubuntu-22.04}
12+
image: "darkwizard242/ansible:${DISTRO:-ubuntu-22.04}"
1313
volumes:
1414
- /sys/fs/cgroup:/sys/fs/cgroup:ro
1515
pre_build_image: true

tasks/install_debian.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# tasks file for uget - Debian/Ubuntu Family
33

44
- name: Debian/Ubuntu Family | Installing {{ uget_app }}
5-
apt:
5+
ansible.builtin.apt:
66
name: "{{ uget_app }}"
77
state: "{{ uget_desired_state }}"
88
force_apt_get: yes

tasks/install_el.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# tasks file for uget - EL
33

44
- name: EL Family | Installing {{ uget_app }}
5-
yum:
5+
ansible.builtin.yum:
66
name: "{{ uget_app }}"
77
state: "{{ uget_desired_state }}"
88
update_cache: yes

tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# tasks file for uget
33

44
- name: Import install_debian.yml if OS family is Debian
5-
import_tasks: install_debian.yml
5+
ansible.builtin.import_tasks: install_debian.yml
66
when: ansible_os_family == "Debian"
77

88
- name: Import install_el.yml if OS family is EL
9-
import_tasks: install_el.yml
9+
ansible.builtin.import_tasks: install_el.yml
1010
when: ansible_os_family == "RedHat"

0 commit comments

Comments
 (0)