Merge pull request #1 from ccdc-opensource/update_role_names

Update role names

Author: Claudio Bantaloukas

.editorconfig

@@ -1,8 +1,15 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://editorconfig.org
+
 root = true
 
 [*]
 indent_style = space
-indent_size = 2
-charset = utf-8
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
 trim_trailing_whitespace = true
-insert_final_newline = true
+
+[*.yml]
+indent_style = space
+indent_size = 2

.github/workflows/common_ccdc_status_checks.yml

@@ -1,3 +1,4 @@
+---
 # This status check is updated on all repositories by the moan.py script
 # in the github-repository-management repository.
 # Changes in this file will be overwritten periodically.

.github/workflows/lint-ansible-role.yml

@@ -0,0 +1,30 @@
+---
+name: Lint
+
+on: [pull_request]
+
+jobs:
+  lint:
+    name: Linting
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.9
+          architecture: x64
+
+      - name: Checkout
+        uses: actions/checkout@main
+
+      - name: Install linters
+        run: pip install ansible ansible-lint yamllint
+
+      - name: Run ansible-lint
+        run: "ansible-lint ."
+
+      - name: Run yamllint
+        run: "yamllint ."

.yamllint.yml

@@ -0,0 +1,61 @@
+# -*- mode: yaml -*-
+# vim:ts=2:sw=2:ai:si:syntax=yaml
+#
+# yamllint configuration directives
+# Project Homepage: https://github.com/adrienverge/yamllint
+#
+# Overriding rules in files:
+# http://yamllint.readthedocs.io/en/latest/disable_with_comments.html
+---
+extends: default
+
+# Rules documentation: http://yamllint.readthedocs.io/en/latest/rules.html
+rules:
+  braces:
+    # Defaults
+    # min-spaces-inside: 0
+    # max-spaces-inside: 0
+
+    # Keeping 0 min-spaces to not error on empty collection definitions
+    min-spaces-inside: 0
+    # Allowing one space inside braces to improve code readability
+    max-spaces-inside: 1
+
+  brackets:
+    # Defaults
+    # min-spaces-inside: 0
+    # max-spaces-inside: 0
+
+    # Keeping 0 min-spaces to not error on empty collection definitions
+    min-spaces-inside: 0
+    # Allowing one space inside braces to improve code readability
+    max-spaces-inside: 1
+
+  comments:
+    # Defaults
+    # level: warning
+    # require-starting-space: true
+
+    # Disabling to allow for code comment blocks and #!/usr/bin/ansible-playbook
+    require-starting-space: false
+    min-spaces-from-content: 1
+
+  indentation:
+    # Defaults
+    # spaces: consistent
+    # indent-sequences: true
+    # check-multi-line-strings: false
+
+    # Requiring 2 space indentation
+    spaces: 2
+    # Requiring consistent indentation within a file, either indented or not
+    indent-sequences: consistent
+
+  # Disabling due to copious amounts of long lines in the code which would
+  # require a code style change to resolve
+  line-length:
+    # Defaults
+    max: 160
+
+  # Disabling due to become: true being used pervasively in roles
+  truthy: disable

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 The Cambridge Crystallographic Data Centre (Open Source)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -6,18 +6,17 @@ Applying this role will set up appropriate C++ compilers and base system require
 
 ### Linux
 
-- devtoolset-8 (CentOS)
-- build-essential (Debian)
-
+-   devtoolset-10 (CentOS)
+-   build-essential (Debian)
 
 ### macOS
 
-- XCode
+-   XCode
 
 ### Windows
 
-- Visual Studio 2017 VC Tools
-- Visual Studio 2017 Remote Tools
+-   Visual Studio 2019 VC Tools
+-   Visual Studio 2010 Remote Tools
 
 ## Requirements
 
@@ -35,12 +34,12 @@ None.
 
     - hosts: all
       roles:
-        - ccdc-cpp-compiler
+        - ccdc.cpp_compiler
 
 ## License
 
 MIT / BSD
 
 ## Author Information
 
-This role was created in 2020 by Claudio Bantaloukas, based on existing roles at CCDC, by Jeff Geerling and google searches
+This role was created in 2020 by Claudio Bantaloukas, based on existing roles at CCDC, by Jeff Geerling and google searches

files/enable-llvm-toolset.sh

@@ -1 +1 @@
-source scl_source enable llvm-toolset-10.0
+source scl_source enable llvm-toolset-10.0

meta/main.yml

@@ -2,27 +2,26 @@
 dependencies: []
 
 galaxy_info:
-  author: cbantaloukas@ccdc.cam.ac.uk
+  role_name: cpp_compiler
+  namespace: ccdc
+  author: rockdreamer
   description: C++ compiler deployment and setup for CCDC build machines.
-  company: "CCDC"
+  company: The Cambridge Crystallographic Data Centre
   license: "license (BSD, MIT)"
   min_ansible_version: 2.9
   platforms:
     - name: EL
       versions:
         - all
-    - name: Fedora
-      versions:
-        - all
     - name: Debian
       versions:
         - all
     - name: Ubuntu
       versions:
         - all
-    - name: Darwin
+    - name: MacOSX
       versions:
-        - all
+        - 10.15
     - name: Windows
       versions:
         - all

tasks/CentOS.yml

@@ -6,19 +6,21 @@
       - llvm-toolset-10.0
       - llvm-toolset-10.0-git-clang-format
       - llvm-toolset-10.0-clang-tools-extra
-    state: latest
+    state: present
     use_backend: yum
-  become: yes
+  become: true
 
 - name: Enable devtoolset globally for all users
   # See https://developers.redhat.com/blog/2014/03/19/permanently-enable-a-software-collection/
   copy:
     src: enable-devtoolset.sh
     dest: /etc/profile.d/enable-devtoolset.sh
-  become: yes
+    mode: u=rwx,g=rx,o=rx
+  become: true
 
 - name: Enable llvm-toolset globally for all users
   copy:
     src: enable-llvm-toolset.sh
     dest: /etc/profile.d/enable-llvm-toolset.sh
-  become: yes
+    mode: u=rwx,g=rx,o=rx
+  become: true

tasks/Darwin.yml

@@ -6,7 +6,7 @@
 
 - name: "Download XCode {{ xcode_version }}"
   shell: >
-    jfrog rt dl 
+    jfrog rt dl
     --flat
     --fail-no-op
     --retries=100
@@ -38,23 +38,23 @@
   file:
     state: absent
     path: "~/Downloads/Xcode_{{ xcode_version }}.xip"
-  
-- name: switch to /Applications/Xcode_{{ xcode_version }}.app
+
+- name: switch to /Applications/Xcode_{{ xcode_version }}.app # noqa: no-changed-when
   command: xcode-select --switch /Applications/Xcode_{{ xcode_version }}.app/Contents/Developer
   become: true
 
-- name: Accept Xcode licence
+- name: Accept Xcode licence # noqa: no-changed-when
   command: xcodebuild -license accept
   become: true
 
-- name: Get list of installed packages
+- name: Get list of installed packages # noqa: no-changed-when
   command: pkgutil --pkgs
   register: pkgutil_packages
 
 - name: Get list of packages available with Xcode
   find:
     path: /Applications/Xcode_{{ xcode_version }}.app/Contents/Resources/Packages/
-    patterns: '*.pkg'
+    patterns: "*.pkg"
     recurse: no
   register: packages