Skip to content

Commit

Permalink
Test using galaxy-importer, fix metadata (#62)
Browse files Browse the repository at this point in the history
  • Loading branch information
bkabrda authored Sep 26, 2024
1 parent ee0c92a commit fa1afb1
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ansible-lint.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Run ansible-lint
name: Run linters (ansible-lint, antsibull-docs, galaxy-importer)
on:
push:
pull_request:

jobs:
ansible-lint:
run-linters:
runs-on: ubuntu-latest
steps:
- name: Checkout code
Expand All @@ -17,6 +17,7 @@ jobs:
# we also lint the molecule setup
ansible-galaxy install -r molecule/requirements.yml
make lint
make galaxy-importer-test
# ensure that the role README was regenerated
make role-readme
if ! git diff --exit-code roles/tas_single_node/README.md; then
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ context/
*+00:00.json
*.swp
.vscode/
importer_result.json
redhat-artifact_signer-*.tar.gz
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ lint:
ansible-lint
antsibull-docs lint-collection-docs --plugin-docs --skip-rstcheck .

galaxy-importer-test:
ansible-galaxy collection build --force
python -m galaxy_importer.main redhat-artifact_signer-*.tar.gz

role-readme: galaxy.yml roles/tas_single_node/README.j2 roles/tas_single_node/meta/argument_specs.yml roles/tas_single_node/meta/main.yml
# Trying to put aar_doc in testing-requirements.txt leads to dependency hell,
# but if we install it in with other tools from testing-requirements.txt, it works fine
Expand Down
4 changes: 2 additions & 2 deletions galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ authors:
- Tommy Dalton <[email protected]>
- Aleksy Siek <[email protected]>
description: Install and configure RHTAS, a downstream redistribution of the Sigstore project.
license_file: Apache-2.0
license_file: LICENSE
tags: [sigstore, tas, rhtas, security, cosign]
# NOTE: when updating, also update dependencies in requirements.yml
dependencies: {}
repository: https://github.com/securesign/artifact-signer-ansible/
documentation: http://TODO.com
documentation: https://docs.redhat.com/en/documentation/red_hat_trusted_artifact_signer
homepage: https://github.com/securesign/artifact-signer-ansible#rhtas-ansible-collection
issues: https://github.com/securesign/artifact-signer-ansible/issues

Expand Down
1 change: 1 addition & 0 deletions testing-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ansible-lint==24.6.1
antsibull-docs==2.13.1
galaxy-importer==0.4.25
molecule==24.7.0
# testing farm should depend on setuptools, but it doesn't; list them here explicitly
setuptools==72.1.0
Expand Down

0 comments on commit fa1afb1

Please sign in to comment.