Skip to content

Commit

Permalink
Merge pull request #38 from patrickjahns/ci_move_to_github_actions
Browse files Browse the repository at this point in the history
ci: move to github actions
  • Loading branch information
patrickjahns authored Dec 14, 2020
2 parents 8b6b1b2 + 717c09b commit e2dcef9
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 54 deletions.
19 changes: 0 additions & 19 deletions .github/workflows/lint.yml

This file was deleted.

50 changes: 50 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Test
on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
ansible-later:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: ansible-later
uses: patrickjahns/ansible-later-action@v1
with:
config: ".later.yml"
path: "**/*.yml"

molecule:
runs-on: ubuntu-latest
strategy:
matrix:
include:
- ANSIBLE: 2.8
- ANSIBLE: 2.9
- ANSIBLE: "2.10"
- ANSIBLE: "2.10"
MOLECULE_DISTRO: ubuntu1804
- ANSIBLE: "2.10"
MOLECULE_DISTRO: ubuntu2004
- ANSIBLE: "2.10"
MOLECULE_DISTRO: debian10
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.7
uses: actions/setup-python@v2
with:
python-version: 3.7
- name: Install tox
run: |
python -m pip install --upgrade pip
pip install tox tox-gh-actions
- name: Run molecule
env:
ANSIBLE: ${{ matrix.ANSIBLE }}
MOLECULE_DISTRO: ${{ matrix.MOLECULE_DISTRO }}
run: |
tox -- molecule test --all --destroy always
30 changes: 0 additions & 30 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Ansible Role: promtail

[![Build Status](https://travis-ci.org/patrickjahns/ansible-role-promtail.svg?branch=master)](https://travis-ci.org/patrickjahns/ansible-role-promtail)
[![Test](https://github.com/patrickjahns/ansible-role-promtail/workflows/Test/badge.svg)](https://github.com/patrickjahns/ansible-role-promtail/actions?query=workflow%3ATest+branch%3Amaster)
[![License](https://img.shields.io/badge/license-MIT%20License-brightgreen.svg)](https://opensource.org/licenses/MIT)
[![Ansible Role](https://img.shields.io/badge/ansible%20role-patrickjahns.promtail-blue.svg)](https://galaxy.ansible.com/patrickjahns/promtail/)
[![GitHub tag](https://img.shields.io/github/tag/patrickjahns/ansible-role-promtail.svg)](https://github.com/patrickjahns/ansible-role-promtail/tags)
Expand Down
2 changes: 1 addition & 1 deletion molecule/default/tests/test_default.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

@pytest.fixture()
def AnsibleDefaults():
with open("../../defaults/main.yml", 'r') as stream:
with open("./defaults/main.yml", 'r') as stream:
return yaml.full_load(stream)


Expand Down
2 changes: 1 addition & 1 deletion test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ molecule>=3.0.0
molecule-docker
docker
ansible-lint>=3.4.0
testinfra>=1.7.0
pytest-testinfra
flake8
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ minversion = 1.8
envlist = ansible{27,28,29,210}
skipsdist = true

[travis]
[gh-actions]
python =
3.6: ansible{28,29,210}
3.7: ansible{28,29,210}

[travis:env]
[gh-actions:env]
ANSIBLE=
2.7: ansible27
2.8: ansible28
Expand Down

0 comments on commit e2dcef9

Please sign in to comment.