diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 4f9efda..f48a5e0 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -7,10 +7,10 @@ on: push: branches: - 'feature*' - - 'feature/*' - 'feature_*' + - 'feature/*' + - 'hotfix/*' - 'hotfix*' - - 'hotifx/*' - 'master' schedule: - cron: '0 12 * * *' @@ -26,7 +26,7 @@ jobs: steps: - name: Checkout source code - uses: actions/checkout@v1 + uses: actions/checkout@v2 with: path: 'darkwizard242.crictl' fetch-depth: 0 @@ -34,6 +34,7 @@ jobs: - name: SonarCloud Scan uses: sonarsource/sonarcloud-github-action@master with: + projectBaseDir: 'darkwizard242.crictl' args: > -Dsonar.projectVersion=${{ github.ref }}_${{ github.run_number }} env: @@ -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' @@ -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' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c68f27b..b23d2c8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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/.*\///') diff --git a/LICENSE b/LICENSE index a07a99b..535f35c 100644 --- a/LICENSE +++ b/LICENSE @@ -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 diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 51f5ed1..f21feef 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -3,3 +3,5 @@ hosts: all roles: - role: darkwizard242.crictl + vars: + ansible_python_interpreter: /usr/bin/python3 diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index b594932..b5f4ba7 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -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