Skip to content

Commit

Permalink
Merge pull request #4 from darkwizard242/feature/refactoring
Browse files Browse the repository at this point in the history
Set tasks fqmn, update action versions and matrixes
  • Loading branch information
darkwizard242 committed Feb 23, 2023
2 parents 7617368 + 3550bcc commit 83c073e
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 23 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
code_quality:

name: SonarCloud Code Quality Check
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:

- name: Checkout source code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: 'darkwizard242.crictl'
fetch-depth: 0
Expand All @@ -45,23 +45,23 @@ jobs:
build:

name: Build & Test
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
max-parallel: 6
matrix:
IMAGE: [ubuntu-20.04, ubuntu-18.04, rockylinux-8, centos-7, debian-buster, debian-stretch]
IMAGE: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, rockylinux-8, centos-7, debian-bullseye, debian-buster, debian-stretch]

steps:

- name: Checkout source code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: 'darkwizard242.crictl'

- name: Set up Python 3.10.0
uses: actions/setup-python@v2
- name: Set up Python 3.10
uses: actions/setup-python@v3
with:
python-version: 3.10.0
python-version: '3.10'

- name: Update repo cache, install python3-setuptools and required pip modules
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ jobs:
release:

name: Release
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:

- name: Checkout source code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: 'darkwizard242.awless'

- name: Set up Python 3.10.0
uses: actions/setup-python@v2
- name: Set up Python 3.10
uses: actions/setup-python@v3
with:
python-version: 3.10.0
python-version: '3.10'

- name: Update repo cache, install python3-setuptools and required pip modules
run: |
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2022 Ali Muhammad
Copyright (c) 2023 Ali Muhammad

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
8 changes: 5 additions & 3 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,18 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- jammy
- focal
- bionic
- name: Debian
versions:
- stretch
- bullseye
- buster
- stretch
- name: EL
versions:
- 7
- 8
- 7

galaxy_tags:
- crictl
Expand Down
4 changes: 2 additions & 2 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ lint: |
ansible-lint
flake8
platforms:
- name: ${DISTRO:-ubuntu-20.04}
image: "darkwizard242/ansible:${DISTRO:-ubuntu-20.04}"
- name: ${DISTRO:-ubuntu-22.04}
image: "darkwizard242/ansible:${DISTRO:-ubuntu-22.04}"
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
pre_build_image: true
Expand Down
2 changes: 1 addition & 1 deletion tasks/install_debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# tasks file for crictl | Debian/Ubuntu Family

- name: Debian/Ubuntu Family | Downloading and extracting {{ crictl_app }} {{ crictl_version }}
unarchive:
ansible.builtin.unarchive:
src: "{{ crictl_dl_url }}"
dest: "{{ crictl_bin_path }}"
owner: "{{ crictl_file_owner }}"
Expand Down
2 changes: 1 addition & 1 deletion tasks/install_el.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# tasks file for crictl | EL Family

- name: EL Family | Downloading and extracting {{ crictl_app }} {{ crictl_version }}
unarchive:
ansible.builtin.unarchive:
src: "{{ crictl_dl_url }}"
dest: "{{ crictl_bin_path }}"
owner: "{{ crictl_file_owner }}"
Expand Down
4 changes: 2 additions & 2 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# tasks file for crictl

- name: Import install_debian.yml if OS family is Debian
import_tasks: install_debian.yml
ansible.builtin.import_tasks: install_debian.yml
when: ansible_os_family == "Debian"

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

0 comments on commit 83c073e

Please sign in to comment.