From e205c6c0cf372935798a8b0103de9e75ab2e5be0 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Sun, 15 May 2022 19:19:11 +0200 Subject: [PATCH] Rerun prettier --- .gitlab-ci.yml | 2 +- package-lock.json | 33 +++++++++++++++++++++++++++++++++ package.json | 5 +++++ tasks/aur.yml | 6 ++++++ tasks/docker.yml | 10 ++-------- tasks/main.yml | 4 ++-- vars.yml | 7 ++----- 7 files changed, 51 insertions(+), 16 deletions(-) create mode 100644 package-lock.json create mode 100644 package.json diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9ade6f..68f44e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ lint: stage: lint image: node:12 before_script: - - npm install prettier --no-save + - npm install script: - npx prettier '**/*.yml' --check diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..0db7ba2 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,33 @@ +{ + "name": "development", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "prettier": "^2.6.2" + } + }, + "node_modules/prettier": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz", + "integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==", + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + } + }, + "dependencies": { + "prettier": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz", + "integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..e1f5891 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "prettier": "^2.6.2" + } +} diff --git a/tasks/aur.yml b/tasks/aur.yml index f2ab39b..6e8a2e7 100644 --- a/tasks/aur.yml +++ b/tasks/aur.yml @@ -1,3 +1,9 @@ +- name: retrieve directory stats + stat: + path: '{{ aur_build_dir }}/{{ item.name }}' + register: build_dir_stats + +# TODO become based on the directories stats - name: clone aur packages become: true git: diff --git a/tasks/docker.yml b/tasks/docker.yml index e89f666..111d865 100644 --- a/tasks/docker.yml +++ b/tasks/docker.yml @@ -4,14 +4,8 @@ src: '{{ item.src }}' dest: '{{ item.dest }}' loop: - - { - src: 'templates/subgid.j2', - dest: '/etc/subgid', - } - - { - src: 'templates/subuid.j2', - dest: '/etc/subuid', - } + - { src: 'templates/subgid.j2', dest: '/etc/subgid' } + - { src: 'templates/subuid.j2', dest: '/etc/subuid' } - name: setup desktop configuration copy: diff --git a/tasks/main.yml b/tasks/main.yml index d9bea5e..bd60d4f 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -22,8 +22,8 @@ src: 'templates/konsole.profile.j2', dest: '{{ xdg_data_dir }}/konsole/Standard.profile', } - - { + - { src: 'templates/konsole.colorscheme.j2', - dest: '{{ xdg_data_dir }}/konsole/BlackOnWhite.colorscheme' + dest: '{{ xdg_data_dir }}/konsole/BlackOnWhite.colorscheme', } - { src: 'templates/konsole.config.j2', dest: '{{ xdg_config_dir }}/konsolerc' } diff --git a/vars.yml b/vars.yml index 522bd3c..a1c42d7 100644 --- a/vars.yml +++ b/vars.yml @@ -15,13 +15,10 @@ packages: - ttf-ibm-plex aur_packages: - - { - url: 'https://aur.archlinux.org/rootlesskit.git', - name: 'rootlesskit' - } + - { url: 'https://aur.archlinux.org/rootlesskit.git', name: 'rootlesskit' } - { url: 'https://aur.archlinux.org/docker-rootless-extras-bin.git', - name: 'docker-rootless' + name: 'docker-rootless', } aur_build_dir: '/usr/local/src'