From e996f5f87ac5527c48f95a515e331404bdc05e98 Mon Sep 17 00:00:00 2001 From: Robert de Bock Date: Wed, 20 May 2020 15:34:23 +0200 Subject: [PATCH] Bump version of molecule action, update tox to use py38 and fix "path". --- templates/molecule-action.yml.j2 | 12 +++++++----- templates/tox.ini.j2 | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/templates/molecule-action.yml.j2 b/templates/molecule-action.yml.j2 index 660e3e4..a47d34a 100644 --- a/templates/molecule-action.yml.j2 +++ b/templates/molecule-action.yml.j2 @@ -17,11 +17,13 @@ jobs: steps: - name: checkout uses: actions/checkout@v2 - - name: molecule - uses: robertdebock/molecule-action@2.2.0 with: - entrypoint: /usr/local/bin/molecule - args: lint + path: {% raw %}"${{ github.repository }}"{% endraw %} + + - name: molecule + uses: robertdebock/molecule-action@2.3.4 + with: + command: lint test: needs: - lint @@ -49,7 +51,7 @@ jobs: - name: parse apparmor for mysql run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld - name: molecule - uses: robertdebock/molecule-action@2.2.0 + uses: robertdebock/molecule-action@2.3.4 with: image: {% raw %}${{ matrix.config.image }}{% endraw %} diff --git a/templates/tox.ini.j2 b/templates/tox.ini.j2 index 28bec30..bf71daa 100644 --- a/templates/tox.ini.j2 +++ b/templates/tox.ini.j2 @@ -2,13 +2,13 @@ [tox] minversion = 3.7 {% if tox_versions is defined %} -envlist = py{37}-ansible-{% raw %}{{% endraw %}{% for version in tox_versions %}{{ version }}{% if not loop.last %},{% endif %}{% endfor %}{% raw %}}{% endraw %} +envlist = py{38}-ansible-{% raw %}{{% endraw %}{% for version in tox_versions %}{{ version }}{% if not loop.last %},{% endif %}{% endfor %}{% raw %}}{% endraw %} {% else %} # Disabled "next" because of: # https://github.com/ansible-community/molecule/issues/2626. -# envlist = py{37}-ansible-{previous,current,next} -envlist = py{37}-ansible-{previous,current} +# envlist = py{38}-ansible-{previous,current,next} +envlist = py{38}-ansible-{previous,current} {% endif %} skipsdist = true