From 9dc223b12c9b1995153b7ad252110124b6fdb929 Mon Sep 17 00:00:00 2001 From: L3D Date: Tue, 23 Mar 2021 16:35:44 +0100 Subject: [PATCH] improve linting --- .chglog/config.yml | 1 + .github/workflows/galaxy.yml | 16 +++---- .github/workflows/test.yml | 1 + .gitignore | 3 +- .yamllint | 8 ++++ .../test_restic/tasks/test_access_files.yml | 32 ++++++------- .../test_restic/tasks/test_backup_files.yml | 48 +++++++++---------- .../test_restic/tasks/test_restic_link.yml | 16 +++---- 8 files changed, 67 insertions(+), 58 deletions(-) create mode 100644 .yamllint diff --git a/.chglog/config.yml b/.chglog/config.yml index 6b97559..1881dcf 100644 --- a/.chglog/config.yml +++ b/.chglog/config.yml @@ -1,3 +1,4 @@ +--- style: github template: CHANGELOG.tpl.md info: diff --git a/.github/workflows/galaxy.yml b/.github/workflows/galaxy.yml index 93e5a66..b5dc0ec 100644 --- a/.github/workflows/galaxy.yml +++ b/.github/workflows/galaxy.yml @@ -1,22 +1,20 @@ --- -name: 🌌 Galaxy import +name: Galaxy release +# yamllint disable-line rule:truthy on: push: - branches: - - master + branches: ['main'] release: - types: - - published + types: ['created'] jobs: - import: - name: 🚀 Galaxy Action + build: runs-on: ubuntu-latest steps: - name: checkout uses: actions/checkout@v2 - name: galaxy - uses: robertdebock/galaxy-action@1.1.1 + uses: robertdebock/galaxy-action@1.1.0 with: - galaxy_api_key: ${{ secrets.GALAXY_API_KEY }} + galaxy_api_key: ${{ secrets.galaxy_api_key }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 508bb4c..3d4853a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,6 @@ --- name: 🎭 Tests +# yamllint disable-line rule:truthy on: push: paths: diff --git a/.gitignore b/.gitignore index 496ee2c..3bbb019 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.DS_Store \ No newline at end of file +.cache +.DS_Store diff --git a/.yamllint b/.yamllint new file mode 100644 index 0000000..cb32cb1 --- /dev/null +++ b/.yamllint @@ -0,0 +1,8 @@ +--- +extends: default + +rules: + # 150 chars should be enough, but don't fail if a line is longer + line-length: + max: 150 + level: warning diff --git a/molecule/default/test_restic/tasks/test_access_files.yml b/molecule/default/test_restic/tasks/test_access_files.yml index 5698647..74418f9 100644 --- a/molecule/default/test_restic/tasks/test_access_files.yml +++ b/molecule/default/test_restic/tasks/test_access_files.yml @@ -1,18 +1,18 @@ --- - - name: Stat test access file - stat: - path: ~/restic/access-test.sh - register: test_file - - name: Check that the test access file exists - assert: - that: - - test_file.stat.exists +- name: Stat test access file + stat: + path: ~/restic/access-test.sh + register: test_file +- name: Check that the test access file exists + assert: + that: + - test_file.stat.exists - - name: Stat test_stdin access file - stat: - path: ~/restic/access-test_stdin.sh - register: test_stdin_file - - name: Check that the test_stdin access file exists - assert: - that: - - test_stdin_file.stat.exists +- name: Stat test_stdin access file + stat: + path: ~/restic/access-test_stdin.sh + register: test_stdin_file +- name: Check that the test_stdin access file exists + assert: + that: + - test_stdin_file.stat.exists diff --git a/molecule/default/test_restic/tasks/test_backup_files.yml b/molecule/default/test_restic/tasks/test_backup_files.yml index fc22c65..25c6349 100644 --- a/molecule/default/test_restic/tasks/test_backup_files.yml +++ b/molecule/default/test_restic/tasks/test_backup_files.yml @@ -1,27 +1,27 @@ --- - - name: Stat test backup file - stat: - path: ~/restic/backup-test.sh - register: test_file - - name: Check that the test backup file exists - assert: - that: - - test_file.stat.exists +- name: Stat test backup file + stat: + path: ~/restic/backup-test.sh + register: test_file +- name: Check that the test backup file exists + assert: + that: + - test_file.stat.exists - - name: Stat test_stdin backup file - stat: - path: ~/restic/backup-test_stdin.sh - register: test_stdin_file - - name: Check that the test_stdin backup file exists - assert: - that: - - test_stdin_file.stat.exists +- name: Stat test_stdin backup file + stat: + path: ~/restic/backup-test_stdin.sh + register: test_stdin_file +- name: Check that the test_stdin backup file exists + assert: + that: + - test_stdin_file.stat.exists - - name: Run the backup scripts - shell: "./{{ item }}" - args: - chdir: ~/restic/ - with_items: - - backup-dicttest.sh - - backup-test.sh - - backup-test_stdin.sh +- name: Run the backup scripts + shell: "./{{ item }}" + args: + chdir: ~/restic/ + with_items: + - backup-dicttest.sh + - backup-test.sh + - backup-test_stdin.sh diff --git a/molecule/default/test_restic/tasks/test_restic_link.yml b/molecule/default/test_restic/tasks/test_restic_link.yml index e6808c9..eba08b2 100644 --- a/molecule/default/test_restic/tasks/test_restic_link.yml +++ b/molecule/default/test_restic/tasks/test_restic_link.yml @@ -1,9 +1,9 @@ --- - - name: Stat test restic link - stat: - path: ~/restic/restic - register: restic_link - - name: Check that the test restic link exists - assert: - that: - - restic_link.stat.exists +- name: Stat test restic link + stat: + path: ~/restic/restic + register: restic_link +- name: Check that the test restic link exists + assert: + that: + - restic_link.stat.exists