diff --git a/.github/workflows/galaxy.yml b/.github/workflows/galaxy.yml index 51fcb24..dd841b9 100644 --- a/.github/workflows/galaxy.yml +++ b/.github/workflows/galaxy.yml @@ -16,5 +16,10 @@ jobs: # uses: buluma/galaxy-action@v6.25.22 # TODO: rebuild action uses: robertdebock/galaxy-action@1.2.1 with: +<<<<<<< HEAD galaxy_api_key: ${{ secrets.galaxy_api_key }} git_branch: ${{ github.event.repository.default_branch }} +======= + galaxy_api_key: ${{ secrets.galaxy_api_key }} + git_branch: main +>>>>>>> 8b7e675ff09f3ea36be7e07f998f0b4db22f48e3 diff --git a/CHANGELOG.md b/CHANGELOG.md index f972db2..c48814c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## [3.1.13](https://github.com/buluma/ansible-role-bootstrap/tree/3.1.13) (2023-12-17) +## [v3.1.14](https://github.com/buluma/ansible-role-bootstrap/tree/v3.1.14) (2023-12-24) -[Full Changelog](https://github.com/buluma/ansible-role-bootstrap/compare/v3.1.12...3.1.13) +[Full Changelog](https://github.com/buluma/ansible-role-bootstrap/compare/v3.1.12...v3.1.14) + +**Implemented enhancements:** + +- Update README.md [\#147](https://github.com/buluma/ansible-role-bootstrap/pull/147) ([buluma](https://github.com/buluma)) **Merged pull requests:** @@ -209,11 +213,7 @@ ## [v1.0.7](https://github.com/buluma/ansible-role-bootstrap/tree/v1.0.7) (2022-02-02) -[Full Changelog](https://github.com/buluma/ansible-role-bootstrap/compare/v1.0.3...v1.0.7) - -## [v1.0.3](https://github.com/buluma/ansible-role-bootstrap/tree/v1.0.3) (2022-01-30) - -[Full Changelog](https://github.com/buluma/ansible-role-bootstrap/compare/v1.0.6...v1.0.3) +[Full Changelog](https://github.com/buluma/ansible-role-bootstrap/compare/v1.0.6...v1.0.7) ## [v1.0.6](https://github.com/buluma/ansible-role-bootstrap/tree/v1.0.6) (2022-01-30) @@ -225,7 +225,11 @@ ## [v1.0.4](https://github.com/buluma/ansible-role-bootstrap/tree/v1.0.4) (2022-01-30) -[Full Changelog](https://github.com/buluma/ansible-role-bootstrap/compare/v1.0.2...v1.0.4) +[Full Changelog](https://github.com/buluma/ansible-role-bootstrap/compare/v1.0.3...v1.0.4) + +## [v1.0.3](https://github.com/buluma/ansible-role-bootstrap/tree/v1.0.3) (2022-01-30) + +[Full Changelog](https://github.com/buluma/ansible-role-bootstrap/compare/v1.0.2...v1.0.3) ## [v1.0.2](https://github.com/buluma/ansible-role-bootstrap/tree/v1.0.2) (2022-01-30)