diff --git a/templates/galaxy.yml.j2 b/templates/galaxy.yml.j2 index 4229fac..735374a 100644 --- a/templates/galaxy.yml.j2 +++ b/templates/galaxy.yml.j2 @@ -15,6 +15,6 @@ jobs: runs-on: ubuntu-latest steps: - name: galaxy - uses: robertdebock/galaxy-action@1.0.1 + uses: robertdebock/galaxy-action@1.1.0 with: galaxy_api_key: {% raw %}${{ secrets.galaxy_api_key }}{% endraw %} diff --git a/templates/molecule-action.yml.j2 b/templates/molecule-action.yml.j2 index 8a74fe5..1af27d2 100644 --- a/templates/molecule-action.yml.j2 +++ b/templates/molecule-action.yml.j2 @@ -56,11 +56,3 @@ jobs: image: {% raw %}${{ matrix.config.image }}{% endraw %} tag: {% raw %}${{ matrix.config.tag }}{% endraw %} - -{% if tox_parallel is defined %} -{% if tox_parallel %} - options: "--parallel all" - env: - TOX_PARALLEL_NO_SPINNER: 1 -{% endif %} -{% endif %} diff --git a/templates/tox.ini.j2 b/templates/tox.ini.j2 index dce391a..d6d58cf 100644 --- a/templates/tox.ini.j2 +++ b/templates/tox.ini.j2 @@ -16,6 +16,7 @@ deps = next: git+https://github.com/ansible/ansible.git@devel molecule[docker]>=3, <4 docker>=4.2, <4.3 + ansible-lint commands = molecule test setenv = TOX_ENVNAME={envname} diff --git a/templates/travis.yml.j2 b/templates/travis.yml.j2 index f10b564..ec81dd1 100644 --- a/templates/travis.yml.j2 +++ b/templates/travis.yml.j2 @@ -31,11 +31,7 @@ install: - pip install tox script: -{% if tox_parallel is defined and tox_parallel %} - - function retry { counter=0 ; until "$@" ; do exit=$? ; counter=$(($counter + 1)) ; if [ $counter -ge 3 ] ; then return $exit ; fi ; done ; return 0; } ; retry tox --parallel all -{% else %} - function retry { counter=0 ; until "$@" ; do exit=$? ; counter=$(($counter + 1)) ; if [ $counter -ge 3 ] ; then return $exit ; fi ; done ; return 0; } ; retry tox -{% endif %} notifications: webhooks: https://galaxy.ansible.com/api/v1/notifications/