Skip to content

Commit

Permalink
CI/molecule fixes wrt role naming.
Browse files Browse the repository at this point in the history
  • Loading branch information
apollo13 committed Jan 1, 2024
1 parent 026d637 commit c94d057
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 18 deletions.
15 changes: 5 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ on:
pull_request:
branches: [ main ]

env:
ROLE_NAME: apollo13.borgbackup
defaults:
run:
working-directory: 'apollo13.borgbackup'

jobs:
test:
Expand All @@ -29,13 +30,9 @@ jobs:
MOLECULE_DISTRO: ${{ matrix.molecule-distro }}

steps:
- name: Configure variables
run: echo "::set-output name=checkout_path::$ROLE_NAME"
id: config

- uses: actions/checkout@v2
with:
path: ${{ steps.config.outputs.checkout_path }}
path: apollo13.borgbackup

- uses: actions/setup-python@v2

Expand All @@ -45,6 +42,4 @@ jobs:
python -m pip install ansible molecule[testinfra] molecule-plugins[docker] yamllint ansible-lint flake8
- name: Molecule test
run: |
cd $ROLE_NAME
molecule test
run: molecule test
12 changes: 5 additions & 7 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,23 @@ dependencies: []

galaxy_info:
role_name: borgbackup
author: Florian Apolloner & contributors
author: apollo13
description: Configure Borgbackup on EL/Ubuntu/Debian. With support for clients & servers, as well as borgbase.com.
license: MIT
min_ansible_version: 2.9
platforms:
- name: EL
versions:
- 7
- 8
- all
- name: Fedora
versions:
- 32
- all
- name: Ubuntu
versions:
- bionic
- focal
- all
- name: Debian
versions:
- buster
- all
galaxy_tags:
- borgbackup
- backup
Expand Down
2 changes: 1 addition & 1 deletion molecule/default/molecule.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---

role_name_check: 1
dependency:
name: galaxy
driver:
Expand Down

0 comments on commit c94d057

Please sign in to comment.