Skip to content

Commit 1cae188

Browse files
authored
Merge pull request #5 from Oefenweb/make-use-of-github-actions
Make use of Github actions
2 parents 78fc119 + 7d1c295 commit 1cae188

File tree

16 files changed

+202
-124
lines changed

16 files changed

+202
-124
lines changed

.ansible-lint

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
warn_list:
3+
- '106'

.github/workflows/ci.yml

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
---
2+
name: CI
3+
'on':
4+
pull_request:
5+
push:
6+
branches:
7+
- master
8+
schedule:
9+
- cron: '30 1 * * 3'
10+
11+
jobs:
12+
13+
lint:
14+
name: Lint
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Check out the codebase
18+
uses: actions/checkout@v2
19+
20+
- name: Set up Python 3
21+
uses: actions/setup-python@v2
22+
with:
23+
python-version: '3.x'
24+
25+
- name: Install test dependencies
26+
run: pip install ansible-lint[community,yamllint]
27+
28+
- name: Lint code
29+
run: |
30+
yamllint .
31+
ansible-lint
32+
33+
molecule:
34+
name: Molecule
35+
runs-on: ubuntu-latest
36+
defaults:
37+
run:
38+
working-directory: "${{ github.repository }}"
39+
needs:
40+
- lint
41+
strategy:
42+
fail-fast: false
43+
matrix:
44+
include:
45+
- distro: debian8
46+
- distro: debian9
47+
- distro: debian10
48+
- distro: ubuntu1604
49+
ansible-version: '>=2.8, <2.9'
50+
- distro: ubuntu1604
51+
ansible-version: '>=2.9, <2.10'
52+
- distro: ubuntu1604
53+
ansible-version: '>=2.10, <2.11'
54+
- distro: ubuntu1604
55+
- distro: ubuntu1804
56+
- distro: ubuntu2004
57+
58+
steps:
59+
- name: Check out the codebase
60+
uses: actions/checkout@v2
61+
with:
62+
path: "${{ github.repository }}"
63+
64+
- name: Set up Python 3
65+
uses: actions/setup-python@v2
66+
with:
67+
python-version: '3.x'
68+
69+
- name: Install test dependencies
70+
run: pip install 'ansible${{ matrix.ansible-version }}' molecule[docker] docker
71+
72+
- name: Run Molecule tests
73+
run: |
74+
molecule test
75+
env:
76+
ANSIBLE_FORCE_COLOR: '1'
77+
ANSIBLE_VERBOSITY: '2'
78+
MOLECULE_DEBUG: '1'
79+
MOLECULE_DISTRO: "${{ matrix.distro }}"
80+
PY_COLORS: '1'

.github/workflows/release.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Release
3+
'on':
4+
push:
5+
tags:
6+
- '*'
7+
8+
jobs:
9+
10+
release:
11+
name: Release
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Check out the codebase
15+
uses: actions/checkout@v2
16+
17+
- name: Publish to Galaxy
18+
uses: robertdebock/[email protected]
19+
with:
20+
galaxy_api_key: ${{ secrets.GALAXY_API_KEY }}

.travis.yml

Lines changed: 0 additions & 84 deletions
This file was deleted.

.yamllint

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
extends: default
3+
4+
rules:
5+
braces:
6+
max-spaces-inside: 1
7+
level: error
8+
brackets:
9+
max-spaces-inside: 1
10+
level: error
11+
line-length: disable
12+
truthy: disable
13+
14+
ignore: |
15+
.tox/

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## tinyproxy
22

3-
[![Build Status](https://travis-ci.org/Oefenweb/ansible-tinyproxy.svg?branch=master)](https://travis-ci.org/Oefenweb/ansible-tinyproxy) [![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-tinyproxy-blue.svg)](https://galaxy.ansible.com/Oefenweb/tinyproxy)
3+
[![CI](https://github.com/Oefenweb/ansible-tinyproxy/workflows/CI/badge.svg)](https://github.com/Oefenweb/ansible-tinyproxy/actions?query=workflow%3ACI)
4+
[![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-tinyproxy-blue.svg)](https://galaxy.ansible.com/Oefenweb/tinyproxy)
45

56
Set up [tinyproxy](https://tinyproxy.github.io/) in Debian-like systems.
67

Vagrantfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ role = File.basename(File.expand_path(File.dirname(__FILE__)))
55

66
boxes = [
77
{
8-
:name => "ubuntu-1404",
9-
:box => "bento/ubuntu-14.04",
8+
:name => "ubuntu-1604",
9+
:box => "bento/ubuntu-16.04",
1010
:ip => '10.0.0.12',
1111
:cpu => "50",
1212
:ram => "256"
1313
},
1414
{
15-
:name => "ubuntu-1604",
16-
:box => "bento/ubuntu-16.04",
15+
:name => "ubuntu-1804",
16+
:box => "bento/ubuntu-18.04",
1717
:ip => '10.0.0.13',
1818
:cpu => "50",
19-
:ram => "256"
19+
:ram => "384"
2020
},
2121
{
22-
:name => "ubuntu-1804",
23-
:box => "bento/ubuntu-18.04",
22+
:name => "ubuntu-2004",
23+
:box => "bento/ubuntu-20.04",
2424
:ip => '10.0.0.14',
2525
:cpu => "50",
2626
:ram => "384"

meta/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ galaxy_info:
1111
platforms:
1212
- name: Ubuntu
1313
versions:
14-
- trusty
1514
- xenial
1615
- bionic
1716
- focal

molecule/default/converge.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
- name: Converge
3+
hosts: all
4+
become: true
5+
pre_tasks:
6+
- name: include vars
7+
include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
8+
roles:
9+
- ../../../

molecule/default/molecule.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
dependency:
3+
name: galaxy
4+
driver:
5+
name: docker
6+
platforms:
7+
- name: instance
8+
image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu1604}-ansible:latest"
9+
command: ${MOLECULE_DOCKER_COMMAND:-""}
10+
volumes:
11+
- /sys/fs/cgroup:/sys/fs/cgroup:ro
12+
privileged: true
13+
pre_build_image: true
14+
provisioner:
15+
name: ansible
16+
playbooks:
17+
prepare: prepare.yml
18+
converge: converge.yml
19+
verify: verify.yml

0 commit comments

Comments
 (0)