diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index be8ad53..f45365f 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -15,4 +15,4 @@ jobs: - name: Prepare Auto Merge uses: ahmadnassri/action-dependabot-auto-merge@v2 with: - github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }} \ No newline at end of file + github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }} diff --git a/.github/workflows/galaxy.yml b/.github/workflows/galaxy.yml index db817fd..12655ec 100644 --- a/.github/workflows/galaxy.yml +++ b/.github/workflows/galaxy.yml @@ -1,14 +1,18 @@ --- -name: Ansible Galaxy -on: - push: - branches: - - main - release: + name: Ansible Galaxy -jobs: - galaxy: - name: Ansible Galaxy - uses: systemli/github-ansible-workflow/.github/workflows/ansible-galaxy-workflow.yaml@main - secrets: - galaxy-token: ${{ secrets.galaxy_api_key }} + on: + push: + branches: + - main + tags: + - "*" + + jobs: + galaxy: + name: Ansible Galaxy + uses: systemli/github-ansible-workflow/.github/workflows/ansible-galaxy-workflow.yaml@v1.2.0 + with: + git-branch: ${{ github.ref_name }} + secrets: + galaxy-token: ${{ secrets.galaxy_api_key }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dee0dc6..dd9806c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,5 +1,6 @@ --- name: Integration + on: pull_request: push: @@ -18,6 +19,6 @@ on: jobs: integration: name: Integration - uses: systemli/github-ansible-workflow/.github/workflows/ansible-integration-workflow.yaml@main + uses: systemli/github-ansible-workflow/.github/workflows/ansible-integration-workflow.yaml@v1.2.0 with: distros: '[ "debian11", "debian12", "ubuntu2004", "ubuntu2204" ]' diff --git a/meta/main.yml b/meta/main.yml index de190f7..7fc212d 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -13,8 +13,10 @@ galaxy_info: platforms: - name: Debian versions: - - all + - bookworm + - bullseye - name: Ubuntu versions: - - all + - jammy + - focal dependencies: []