Merge pull request #10 from Oefenweb/make-use-of-github-actions

Make use of github actions

.ansible-lint

@@ -0,0 +1,2 @@
+warn_list:
+  - '106'

.github/workflows/ci.yml

@@ -0,0 +1,80 @@
+---
+name: CI
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: '30 1 * * 3'
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase
+        uses: actions/checkout@v2
+
+      - name: Set up Python 3
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies
+        run: pip install yamllint ansible-lint
+
+      - name: Lint code
+        run: |
+          yamllint .
+          ansible-lint
+
+  molecule:
+    name: Molecule
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: "${{ github.repository }}"
+    needs:
+      - lint
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - distro: debian8
+          - distro: debian9
+          - distro: debian10
+          - distro: ubuntu1604
+            ansible-version: '>=2.8, <2.9'
+          - distro: ubuntu1604
+            ansible-version: '>=2.9, <2.10'
+          - distro: ubuntu1604
+            ansible-version: '>=2.10, <2.11'
+          - distro: ubuntu1604
+          - distro: ubuntu1804
+          - distro: ubuntu2004
+
+    steps:
+      - name: Check out the codebase
+        uses: actions/checkout@v2
+        with:
+          path: "${{ github.repository }}"
+
+      - name: Set up Python 3
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies
+        run: pip install 'ansible${{ matrix.ansible-version }}' molecule[docker] docker
+
+      - name: Run Molecule tests
+        run: |
+          molecule test
+        env:
+          ANSIBLE_FORCE_COLOR: '1'
+          ANSIBLE_VERBOSITY: '2'
+          MOLECULE_DEBUG: '1'
+          MOLECULE_DISTRO: "${{ matrix.distro }}"
+          PY_COLORS: '1'

.github/workflows/release.yml

@@ -0,0 +1,20 @@
+---
+name: Release
+'on':
+  push:
+    tags:
+      - '*'
+
+jobs:
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase
+        uses: actions/checkout@v2
+
+      - name: Publish to Galaxy
+        uses: robertdebock/galaxy-action@1.1.0
+        with:
+          galaxy_api_key: ${{ secrets.GALAXY_API_KEY }}

.yamllint

@@ -0,0 +1,15 @@
+---
+extends: default
+
+rules:
+  braces:
+    max-spaces-inside: 1
+    level: error
+  brackets:
+    max-spaces-inside: 1
+    level: error
+  line-length: disable
+  truthy: disable
+
+ignore: |
+  .tox/

Dockerfile

@@ -11,7 +11,7 @@ RUN rm -rf $HOME/.cache
 # ansible
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y gcc libffi-dev libssl-dev && \
   apt-get clean
-RUN pip install ansible==2.9.14
+RUN pip install ansible==2.9.15
 RUN rm -rf $HOME/.cache
 
 # provision

README.md

@@ -1,6 +1,6 @@
 ## rstudio
 
-[![Build Status](https://travis-ci.org/Oefenweb/ansible-rstudio.svg?branch=master)](https://travis-ci.org/Oefenweb/ansible-rstudio)
+[![CI](https://github.com/Oefenweb/ansible-rstudio/workflows/CI/badge.svg)](https://github.com/Oefenweb/ansible-rstudio/actions?query=workflow%3ACI)
 [![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-rstudio-blue.svg)](https://galaxy.ansible.com/Oefenweb/rstudio/)
 
 Set up (the latest version of) [RStudio (IDE)](https://www.rstudio.com/products/rstudio/download/) in Debian-like systems.
@@ -12,7 +12,7 @@ Set up (the latest version of) [RStudio (IDE)](https://www.rstudio.com/products/
 
 #### Variables
 
-* `rstudio_version` [default: `1.2.5033`]: Version to install
+* `rstudio_version` [default: `1.4.1103`, `1.2.5042` for `Debian 8`]: Version to install
 * `rstudio_install` [default: `[]`]: Additional packages to install (e.g. `r-base`)
 
 ## Dependencies
@@ -22,6 +22,7 @@ None
 ## Recommended
 
 * `ansible-r` ([see](https://github.com/Oefenweb/ansible-r))
+* `ansible-rstudio-server` ([see](https://github.com/Oefenweb/ansible-rstudio-server))
 
 #### Example
 

Vagrantfile

@@ -5,22 +5,22 @@ role = File.basename(File.expand_path(File.dirname(__FILE__)))
 
 boxes = [
   {
-    :name => "ubuntu-1404",
-    :box => "bento/ubuntu-14.04",
+    :name => "ubuntu-1604",
+    :box => "bento/ubuntu-16.04",
     :ip => '10.0.0.12',
     :cpu => "50",
     :ram => "256"
   },
   {
-    :name => "ubuntu-1604",
-    :box => "bento/ubuntu-16.04",
+    :name => "ubuntu-1804",
+    :box => "bento/ubuntu-18.04",
     :ip => '10.0.0.13',
     :cpu => "50",
-    :ram => "256"
+    :ram => "384"
   },
   {
-    :name => "ubuntu-1804",
-    :box => "bento/ubuntu-18.04",
+    :name => "ubuntu-2004",
+    :box => "bento/ubuntu-20.04",
     :ip => '10.0.0.14',
     :cpu => "50",
     :ram => "384"

defaults/main.yml

@@ -1,4 +1,4 @@
 # defaults file for rstudio
 ---
-rstudio_version: 1.2.5033
+rstudio_version: "{{ '1.2.5042' if ansible_distribution == 'Debian' and ansible_distribution_version is version('8', '<=') else '1.4.1103' }}"
 rstudio_install: []

meta/main.yml

@@ -10,9 +10,9 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - trusty
         - xenial
         - bionic
+        - focal
     - name: Debian
       versions:
         - jessie

molecule/default/converge.yml

@@ -0,0 +1,9 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+  pre_tasks:
+    - name: include vars
+      include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
+  roles:
+    - ../../../

molecule/default/molecule.yml

@@ -0,0 +1,19 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+platforms:
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu1604}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  playbooks:
+    prepare: prepare.yml
+    converge: converge.yml
+    verify: verify.yml

molecule/default/prepare.yml

@@ -0,0 +1,5 @@
+---
+- name: Prepare
+  hosts: all
+  become: true
+  tasks: []

molecule/default/verify.yml

@@ -0,0 +1,5 @@
+---
+- name: Verify
+  hosts: all
+  become: true
+  tasks: []

tasks/main.yml

@@ -7,12 +7,12 @@
     - "_{{ ansible_distribution | lower }}.yml"
     - _default.yml
   tags:
-   - configuration
-   - rstudio
-   - rstudio-include-variables
+    - configuration
+    - rstudio
+    - rstudio-include-variables
 
 - include: install.yml
   tags:
-   - configuration
-   - rstudio
-   - rstudio-install
+    - configuration
+    - rstudio
+    - rstudio-install

tests/test.yml

@@ -3,8 +3,8 @@
 - hosts: localhost
   connection: local
   become: true
+  pre_tasks:
+    - name: include vars
+      include_vars: "{{ playbook_dir }}/vars/main.yml"
   roles:
     - ../../
-  vars:
-    rstudio_install:
-      - r-base

tests/vagrant.yml

@@ -3,8 +3,8 @@
 - hosts: all
   remote_user: vagrant
   become: true
+  pre_tasks:
+    - name: include vars
+      include_vars: "{{ playbook_dir }}/vars/main.yml"
   roles:
     - ../../
-  vars:
-    rstudio_install:
-      - r-base

tests/vars/main.yml

@@ -0,0 +1,4 @@
+# vars file for rstudio
+---
+rstudio_install:
+  - r-base

vars/_focal.yml

@@ -0,0 +1,3 @@
+# vars file for rstudio
+---
+rstudio_download_url: "https://download1.rstudio.org/desktop/bionic/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"