From f8d51e29d0a9d16cb1eabed47f4a7c2d5f4adb55 Mon Sep 17 00:00:00 2001 From: Michael Buluma Date: Wed, 10 Jul 2024 18:09:54 +0300 Subject: [PATCH] Tox is misbehaving. Default for now. --- .ansible-lint | 3 --- .github/workflows/molecule.yml | 31 +++++++++++++++++++------------ requirements.txt | 4 ++-- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.ansible-lint b/.ansible-lint index fa67b68..f179ac0 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -13,8 +13,5 @@ exclude_paths: - .github - requirements.yml -skip_list: - - yaml[truthy] - enable_list: - name[prefix] diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 36568d3..32802c5 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -12,7 +12,6 @@ on: - main - testing - dependabot/** - # - renovate/** paths-ignore: - '**/README.md' - '**/CHANGELOG.md' @@ -21,8 +20,7 @@ on: pull_request: pull_request_target: schedule: - # - cron: '1 1 1 * *' - - cron: '1 1 * * *' + - cron: '1 1 1 * *' workflow_dispatch: @@ -32,6 +30,7 @@ concurrency: group: ${{ github.ref }}-${{ github.workflow }} cancel-in-progress: true + jobs: lint: runs-on: ubuntu-20.04 @@ -41,7 +40,9 @@ jobs: - name: ansible-lint uses: ansible-community/ansible-lint-action@main test: - runs-on: ubuntu-22.04 + needs: + - lint + runs-on: ubuntu-20.04 strategy: fail-fast: false matrix: @@ -69,18 +70,24 @@ jobs: - image: "docker-molecule-images" tag: "noble" steps: - - name: Checkout Role + - name: checkout uses: actions/checkout@v4 + + - name: Set up Python 3. + uses: actions/setup-python@v5 with: - path: "${{ github.repository }}" - - name: Running Molecule Test - uses: buluma/molecule-action@v24.6.17 - with: + python-version: '3.x' + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + + - name: molecule + run: molecule converge + env: image: ${{ matrix.config.image }} tag: ${{ matrix.config.tag }} - - name: Running Role Test - run: ansible-galaxy role import --api-key ${{ secrets.galaxy_api_key }} buluma ${{ github.event.repository.name }} - dependabot: needs: - lint diff --git a/requirements.txt b/requirements.txt index d24d40e..5250f77 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -ansible-compat == 4.* +ansible-compat == 24.* molecule == 24.* molecule-plugins[docker] == 23.* ansible-lint == 24.* paramiko == 3.* # Pinning requests version due to [bug](https://github.com/docker/docker-py/issues/3113) -requests == 2.28.1 +# requests == 2.28.1