From 3fa3686b1b374685189efee4a3e4cd631e02b569 Mon Sep 17 00:00:00 2001 From: L3D Date: Fri, 5 Nov 2021 13:21:19 +0100 Subject: [PATCH] update PS1 title and linting/actions --- .ansible-lint | 2 -- .github/workflows/ansible-debian-bullseye.yml | 18 +++++++++++++ .yamllint | 4 +-- README.md | 4 --- defaults/main.yml | 4 +-- galaxy.yml | 20 +++++++++++++++ travis/Dockerfile.centos-7 | 24 ------------------ travis/Dockerfile.debian-jessie | 17 ------------- travis/Dockerfile.debian-stretch | 18 ------------- travis/Dockerfile.fedora-28 | 25 ------------------- travis/Dockerfile.fedora-29 | 25 ------------------- travis/Dockerfile.ubuntu-bionic | 12 --------- travis/Dockerfile.ubuntu-trusty | 12 --------- travis/Dockerfile.ubuntu-xenial | 12 --------- travis/test.yml | 5 ---- vars/main.yml | 2 +- 16 files changed, 43 insertions(+), 161 deletions(-) delete mode 100644 .ansible-lint create mode 100644 .github/workflows/ansible-debian-bullseye.yml create mode 100644 galaxy.yml delete mode 100644 travis/Dockerfile.centos-7 delete mode 100644 travis/Dockerfile.debian-jessie delete mode 100644 travis/Dockerfile.debian-stretch delete mode 100644 travis/Dockerfile.fedora-28 delete mode 100644 travis/Dockerfile.fedora-29 delete mode 100644 travis/Dockerfile.ubuntu-bionic delete mode 100644 travis/Dockerfile.ubuntu-trusty delete mode 100644 travis/Dockerfile.ubuntu-xenial delete mode 100644 travis/test.yml diff --git a/.ansible-lint b/.ansible-lint deleted file mode 100644 index c1648fc..0000000 --- a/.ansible-lint +++ /dev/null @@ -1,2 +0,0 @@ -skip_list: - - '403' diff --git a/.github/workflows/ansible-debian-bullseye.yml b/.github/workflows/ansible-debian-bullseye.yml new file mode 100644 index 0000000..4b7c45d --- /dev/null +++ b/.github/workflows/ansible-debian-bullseye.yml @@ -0,0 +1,18 @@ +--- +name: Ansible check debian:bullseye + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: ansible check with debian:bullseye + uses: roles-ansible/check-ansible-debian-bullseye-action@main + with: + targets: "./" diff --git a/.yamllint b/.yamllint index 7bb3cd9..a50c33c 100644 --- a/.yamllint +++ b/.yamllint @@ -2,9 +2,9 @@ extends: default rules: - # 280 chars should be enough, but don't fail if a line is longer + # 320 chars should be enough, but don't fail if a line is longer line-length: - max: 280 + max: 320 level: warning braces: level: warning diff --git a/README.md b/README.md index 6c94d44..81fa64a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ dotfiles ========== [![MIT License](https://raw.githubusercontent.com/roles-ansible/ansible_role_dotfiles/master/.github/license.svg?sanitize=true)](https://github.com/roles-ansible/ansible_role_dotfiles/blob/master/LICENSE) -[![Build Status](https://travis-ci.com/roles-ansible/ansible_role_dotfiles.svg?branch=master)](https://travis-ci.com/roles-ansible/ansible_role_dotfiles) [![Galaxy](https://raw.githubusercontent.com/roles-ansible/ansible_role_dotfiles/master/.github/galaxy.svg?sanitize=true)](https://galaxy.ansible.com/do1jlr/dotfiles) intended use @@ -99,13 +98,10 @@ Please have a look into ``defaults/main.yml`` for more configuration options! ### testing -This role is tested with [these github-action](https://github.com/search?q=topic%3Acheck-ansible+topic%3Agithub-actions+org%3Aroles-ansible&type=Repositories) tests for different versions of differen linux systems. Linting is tested via travis-ci and the [ansible-lint action](https://github.com/marketplace/actions/ansible-lint). If you want to find out more about our tests, please have a look at the github marketplace. | test status | Github Marketplace | | :--------- | :---------------- | -| [![Travis Build Status](https://travis-ci.com/roles-ansible/ansible_role_dotfiles.svg?branch=master)](https://travis-ci.com/roles-ansible/ansible_role_dotfiles) | [.travis.yml](https://github.com/roles-ansible/ansible_role_dotfiles/blob/master/.travis.yml) | -||| | [![Ansible Lint check](https://github.com/roles-ansible/ansible_role_dotfiles/workflows/Ansible%20Lint%20check/badge.svg)](https://github.com/roles-ansible/ansible_role_dotfiles/actions?query=workflow%3A%22Ansible+Lint+check%22) | [ansible-lint action](https://github.com/marketplace/actions/ansible-lint) | [![Ansible check debian:stable](https://github.com/roles-ansible/ansible_role_dotfiles/workflows/Ansible%20check%20debian:stable/badge.svg)](https://github.com/roles-ansible/ansible_role_dotfiles/actions?query=workflow%3A%22Ansible+check+debian%3Astable%22) | [ansible test with debian stable](https://github.com/marketplace/actions/check-ansible-debian-stable) | | [![Ansible check debian:latest](https://github.com/roles-ansible/ansible_role_dotfiles/workflows/Ansible%20check%20debian:latest/badge.svg)](https://github.com/roles-ansible/ansible_role_dotfiles/actions?query=workflow%3A%22Ansible+check+debian%3Alatest%22) | [ansible test with debian latest](https://github.com/marketplace/actions/check-ansible-debian-latest) | diff --git a/defaults/main.yml b/defaults/main.yml index 45a2204..f486eb2 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -27,8 +27,8 @@ dotfiles__aliases: dotfiles__bash_completion_enabled: true # fancy promt -dotfiles__user_prompt: '\[\033[01;33m\] $(printf "\xE2\x9D\xA4") \[\033[01;32m\]\u\[\033[01;36m\]@\[\033[01;32m\]\H\[\033[01;34m\] <\A> \[\033[01;35m\] \j \[\033[01;36m\] \w \[\033[01;33m\]\n\[\033[01;33m\] $(git branch 2>/dev/null | sed -n "s/* \(.*\)/\1 /p")$\[\033[01;00m\]' -dotfiles__root_prompt: '\[\033[01;31m\] $(printf "\xE2\x9D\xA4") \[\033[01;32m\]\u\[\033[01;36m\]@\[\033[01;32m\]\H\[\033[01;34m\] <\A> \[\033[01;35m\] \j \[\033[01;36m\] \w \[\033[01;33m\]\n\[\033[01;33m\] $(git branch 2>/dev/null | sed -n "s/* \(.*\)/\1 /p")$\[\033[01;00m\]' +dotfiles__user_prompt: '\e]0; \u@\H <\A> \w\a\[\033[01;33m\] $(printf "\xE2\x9D\xA4") \[\033[01;32m\]\u\[\033[01;36m\]@\[\033[01;32m\]\H\[\033[01;34m\] <\A> \[\033[01;35m\] \j \[\033[01;36m\] \w \[\033[01;33m\]\n\[\033[01;33m\] $(git branch 2>/dev/null | sed -n "s/* \(.*\)/\1 /p")$\[\033[01;00m\]' +dotfiles__root_prompt: '\e]0; \u@\H <\A> \w\a\[\033[01;31m\] $(printf "\xE2\x9D\xA4") \[\033[01;32m\]\u\[\033[01;36m\]@\[\033[01;32m\]\H\[\033[01;34m\] <\A> \[\033[01;35m\] \j \[\033[01;36m\] \w \[\033[01;33m\]\n\[\033[01;33m\] $(git branch 2>/dev/null | sed -n "s/* \(.*\)/\1 /p")$\[\033[01;00m\]' # modify bash history dotfiles__history_control: 'ignoreboth' diff --git a/galaxy.yml b/galaxy.yml new file mode 100644 index 0000000..b5dc0ec --- /dev/null +++ b/galaxy.yml @@ -0,0 +1,20 @@ +--- +name: Galaxy release + +# yamllint disable-line rule:truthy +on: + push: + branches: ['main'] + release: + types: ['created'] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v2 + - name: galaxy + uses: robertdebock/galaxy-action@1.1.0 + with: + galaxy_api_key: ${{ secrets.galaxy_api_key }} diff --git a/travis/Dockerfile.centos-7 b/travis/Dockerfile.centos-7 deleted file mode 100644 index b7c1e90..0000000 --- a/travis/Dockerfile.centos-7 +++ /dev/null @@ -1,24 +0,0 @@ -FROM centos:7 - -# Install systemd -- See https://hub.docker.com/_/centos/ -RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs -RUN yum -y update; \ -(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \ -rm -f /lib/systemd/system/multi-user.target.wants/*; \ -rm -f /etc/systemd/system/*.wants/*; \ -rm -f /lib/systemd/system/local-fs.target.wants/*; \ -rm -f /lib/systemd/system/sockets.target.wants/*udev*; \ -rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \ -rm -f /lib/systemd/system/basic.target.wants/*; \ -rm -f /lib/systemd/system/anaconda.target.wants/*; - -RUN yum -y install epel-release -RUN yum -y install git ansible sudo - -RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers - -RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts - -VOLUME ["/sys/fs/cgroup"] - -CMD ["/usr/sbin/init"] diff --git a/travis/Dockerfile.debian-jessie b/travis/Dockerfile.debian-jessie deleted file mode 100644 index 8d38f0c..0000000 --- a/travis/Dockerfile.debian-jessie +++ /dev/null @@ -1,17 +0,0 @@ -FROM debian:jessie - -RUN apt-get update -y && apt-get install -y --no-install-recommends \ - software-properties-common \ - build-essential \ - libffi-dev \ - libssl-dev \ - python-dev \ - python-pip \ - git \ - && rm -rf /var/lib/apt/lists/* - -RUN pip install --upgrade setuptools && pip install ansible - -RUN mkdir -p /etc/ansible && echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts - -ENTRYPOINT ["/sbin/init"] diff --git a/travis/Dockerfile.debian-stretch b/travis/Dockerfile.debian-stretch deleted file mode 100644 index ee2fbc7..0000000 --- a/travis/Dockerfile.debian-stretch +++ /dev/null @@ -1,18 +0,0 @@ -FROM debian:stretch - -RUN apt-get update -y && apt-get install -y --no-install-recommends \ - software-properties-common \ - build-essential \ - libffi-dev \ - libssl-dev \ - python-dev \ - python-pip \ - git \ - systemd \ - && rm -rf /var/lib/apt/lists/* - -RUN pip install --upgrade setuptools && pip install ansible - -RUN mkdir -p /etc/ansible && echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts - -ENTRYPOINT ["/bin/systemd"] diff --git a/travis/Dockerfile.fedora-28 b/travis/Dockerfile.fedora-28 deleted file mode 100644 index 9f88b0f..0000000 --- a/travis/Dockerfile.fedora-28 +++ /dev/null @@ -1,25 +0,0 @@ -FROM fedora:28 - -RUN dnf -y update - -RUN dnf -y install systemd && \ -(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \ -rm -f /lib/systemd/system/multi-user.target.wants/*;\ -rm -f /etc/systemd/system/*.wants/*;\ -rm -f /lib/systemd/system/local-fs.target.wants/*; \ -rm -f /lib/systemd/system/sockets.target.wants/*udev*; \ -rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \ -rm -f /lib/systemd/system/basic.target.wants/*;\ -rm -f /lib/systemd/system/anaconda.target.wants/*; - -RUN dnf -y install python2 python-pip libffi-devel redhat-rpm-config python-devel openssl-devel sudo git @development-tools - -RUN pip install ansible - -RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers - -RUN mkdir -p /etc/ansible && echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts - -VOLUME ["/sys/fs/cgroup"] - -CMD ["/usr/sbin/init"] diff --git a/travis/Dockerfile.fedora-29 b/travis/Dockerfile.fedora-29 deleted file mode 100644 index aaa82ff..0000000 --- a/travis/Dockerfile.fedora-29 +++ /dev/null @@ -1,25 +0,0 @@ -FROM fedora:29 - -RUN dnf -y update - -RUN dnf -y install systemd && \ -(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \ -rm -f /lib/systemd/system/multi-user.target.wants/*;\ -rm -f /etc/systemd/system/*.wants/*;\ -rm -f /lib/systemd/system/local-fs.target.wants/*; \ -rm -f /lib/systemd/system/sockets.target.wants/*udev*; \ -rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \ -rm -f /lib/systemd/system/basic.target.wants/*;\ -rm -f /lib/systemd/system/anaconda.target.wants/*; - -RUN dnf -y install python2 python-pip libffi-devel redhat-rpm-config python-devel openssl-devel sudo git @development-tools - -RUN pip install ansible - -RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers - -RUN mkdir -p /etc/ansible && echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts - -VOLUME ["/sys/fs/cgroup"] - -CMD ["/usr/sbin/init"] diff --git a/travis/Dockerfile.ubuntu-bionic b/travis/Dockerfile.ubuntu-bionic deleted file mode 100644 index b535edb..0000000 --- a/travis/Dockerfile.ubuntu-bionic +++ /dev/null @@ -1,12 +0,0 @@ -FROM ubuntu:bionic - -RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y software-properties-common systemd && rm -rf /var/lib/apt/lists/* - -RUN apt-add-repository -y ppa:ansible/ansible && apt-get update && apt-get install -y \ - git \ - ansible \ - && rm -rf /var/lib/apt/lists/* - -RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts - -ENTRYPOINT ["/bin/systemd"] diff --git a/travis/Dockerfile.ubuntu-trusty b/travis/Dockerfile.ubuntu-trusty deleted file mode 100644 index c9687d2..0000000 --- a/travis/Dockerfile.ubuntu-trusty +++ /dev/null @@ -1,12 +0,0 @@ -FROM ubuntu:trusty - -RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y software-properties-common && rm -rf /var/lib/apt/lists/* - -RUN apt-add-repository -y ppa:ansible/ansible && apt-get update && apt-get install -y \ - git \ - ansible \ - && rm -rf /var/lib/apt/lists/* - -RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts - -ENTRYPOINT ["/sbin/init"] diff --git a/travis/Dockerfile.ubuntu-xenial b/travis/Dockerfile.ubuntu-xenial deleted file mode 100644 index 2faaba1..0000000 --- a/travis/Dockerfile.ubuntu-xenial +++ /dev/null @@ -1,12 +0,0 @@ -FROM ubuntu:xenial - -RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y software-properties-common && rm -rf /var/lib/apt/lists/* - -RUN apt-add-repository -y ppa:ansible/ansible && apt-get update && apt-get install -y \ - git \ - ansible \ - && rm -rf /var/lib/apt/lists/* - -RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts - -ENTRYPOINT ["/sbin/init"] diff --git a/travis/test.yml b/travis/test.yml deleted file mode 100644 index 0cf3304..0000000 --- a/travis/test.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- hosts: all - - roles: - - travis_test diff --git a/vars/main.yml b/vars/main.yml index f1627f5..2228fe4 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,3 +1,3 @@ --- -playbook_version_number: 2073 # should be increased integer +playbook_version_number: 2074 # should be increased integer playbook_version_path: 'role_dotfiles_chaos-bodensee_github.version'