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 authored Apr 19, 2023
2 parents bec094f + 9a84d3b commit 8dc4f78
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 21 deletions.
18 changes: 9 additions & 9 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.stacer'
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
max-parallel: 10
matrix:
IMAGE: [ubuntu-20.04, ubuntu-18.04]
IMAGE: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04]

steps:

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

- 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.stacer'

- 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
3 changes: 2 additions & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- jammy
- focal
- bionic

galaxy_tags:
- stacer
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
4 changes: 2 additions & 2 deletions tasks/install_ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# tasks file for stacer - Ubuntu OS

- name: Ubuntu OS | Adding repository {{ stacer_ubuntu_repo }}
apt_repository:
ansible.builtin.apt_repository:
repo: "{{ stacer_ubuntu_repo }}"
state: "{{ stacer_ubuntu_repo_desired_state }}"
filename: "{{ stacer_ubuntu_repo_filename }}"
Expand All @@ -12,7 +12,7 @@
- ansible_distribution_version == "18.04" or ansible_distribution_version == "16.04"

- name: Ubuntu OS | Installing {{ stacer_app }}
apt:
ansible.builtin.apt:
name: "{{ stacer_app }}"
state: "{{ stacer_app_desired_state }}"
force_apt_get: yes
Expand Down
2 changes: 1 addition & 1 deletion tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# tasks file for stacer

- name: Import install_ubuntu.yml if OS distribution is Ubuntu
import_tasks: install_ubuntu.yml
ansible.builtin.import_tasks: install_ubuntu.yml
when: ansible_distribution == "Ubuntu"

0 comments on commit 8dc4f78

Please sign in to comment.