Skip to content

Commit

Permalink
Merge pull request #3 from darkwizard242/feature/update-workflows
Browse files Browse the repository at this point in the history
Update workflows
  • Loading branch information
darkwizard242 committed Feb 4, 2022
2 parents 5042703 + 835dd41 commit 7617368
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 10 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ on:
push:
branches:
- 'feature*'
- 'feature/*'
- 'feature_*'
- 'feature/*'
- 'hotfix/*'
- 'hotfix*'
- 'hotifx/*'
- 'master'
schedule:
- cron: '0 12 * * *'
Expand All @@ -26,14 +26,15 @@ jobs:
steps:

- name: Checkout source code
uses: actions/checkout@v1
uses: actions/checkout@v2
with:
path: 'darkwizard242.crictl'
fetch-depth: 0

- name: SonarCloud Scan
uses: sonarsource/sonarcloud-github-action@master
with:
projectBaseDir: 'darkwizard242.crictl'
args: >
-Dsonar.projectVersion=${{ github.ref }}_${{ github.run_number }}
env:
Expand All @@ -46,14 +47,14 @@ jobs:
name: Build & Test
runs-on: ubuntu-20.04
strategy:
max-parallel: 8
max-parallel: 6
matrix:
IMAGE: [ubuntu-20.04, ubuntu-18.04, centos-8, centos-7, debian-buster, debian-stretch]
IMAGE: [ubuntu-20.04, ubuntu-18.04, rockylinux-8, centos-7, debian-buster, debian-stretch]

steps:

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

Expand All @@ -69,6 +70,7 @@ jobs:
pip3 install -U pip wheel ansible molecule[docker] docker ansible-lint flake8 pytest-testinfra
- name: Execute Molecule test of role for ${{ matrix.IMAGE }}
working-directory: 'darkwizard242.crictl'
run: DISTRO=${{ matrix.IMAGE }} molecule test
env:
PY_COLORS: '1'
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
steps:

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

- name: Set up Python 3.10.0
uses: actions/setup-python@v2
Expand All @@ -31,4 +31,5 @@ jobs:
pip3 install -U pip wheel ansible
- name: Import to Ansible Galaxy.
working-directory: 'darkwizard242.awless'
run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} ${{ github.repository_owner }} $(echo ${{ github.repository }} | sed 's/.*\///')
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) 2021 Ali Muhammad
Copyright (c) 2022 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
2 changes: 2 additions & 0 deletions molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
hosts: all
roles:
- role: darkwizard242.crictl
vars:
ansible_python_interpreter: /usr/bin/python3
2 changes: 1 addition & 1 deletion molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ lint: |
ansible-lint
flake8
platforms:
- name: ${DISTRO:-ubuntu-18.04}
- name: ${DISTRO:-ubuntu-20.04}
image: "darkwizard242/ansible:${DISTRO:-ubuntu-20.04}"
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
Expand Down

0 comments on commit 7617368

Please sign in to comment.