From b71ddc15d031f0fe2fafabd0381eebf5c6a42616 Mon Sep 17 00:00:00 2001 From: Corentin Date: Thu, 4 Jul 2024 10:27:03 +0200 Subject: [PATCH 1/2] fix --- CHANGELOG.md | 7 +++++++ README.md | 4 ++++ config/before_composer.yml | 2 +- config/steps/composer/private_registry.yml | 2 +- defaults/main.yml | 4 ++++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35109aa..2ba7ece 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [1.12.2](https://github.com/le-phare/ansible-deploy/compare/v1.12.1...v1.12.2) (2024-07-04) + +### Bug Fixes + +* **private registry:** add default value for lephare_gitlab_token and lephare_packagist_com_token ([#TODO](https://github.com/le-phare/ansible-deploy/pull/TODO))([TODO](https://github.com/le-phare/ansible-deploy/pull/52/commits/72dd8ad064a212f3bca23396b738d1e9e0ce4665)) + + ## [1.12.1](https://github.com/le-phare/ansible-deploy/compare/v1.12.0...v1.12.1) (2024-07-03) ### Bug Fixes diff --git a/README.md b/README.md index 33b06f6..60d2380 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,10 @@ The defaults vars declared in this module: lephare_composer_home: '~/.config/composer' + lephare_gitlab_token: "" + + lephare_packagist_com_token: "" + lephare_rollbar_notify: true lephare_rollbar_environment: production diff --git a/config/before_composer.yml b/config/before_composer.yml index fd58c21..4af5b6b 100644 --- a/config/before_composer.yml +++ b/config/before_composer.yml @@ -1,5 +1,5 @@ - include_tasks: "../../lephare.ansible-deploy/config/steps/composer/private_registry.yml" - when: lephare_packagist_com_token is defined or lephare_gitlab_token is defined + when: lephare_packagist_com_token != "" or lephare_gitlab_token != "" - name: Set release environment variable shell: chdir={{ansistrano_release_path.stdout}} diff --git a/config/steps/composer/private_registry.yml b/config/steps/composer/private_registry.yml index 97554e8..9a07313 100644 --- a/config/steps/composer/private_registry.yml +++ b/config/steps/composer/private_registry.yml @@ -10,4 +10,4 @@ src: composer/auth.json.j2 dest: "{{ lephare_composer_home }}/auth.json" mode: 0600 - when: lephare_packagist_com_token is defined or lephare_gitlab_token is defined + when: lephare_packagist_com_token != "" or lephare_gitlab_token != "" diff --git a/defaults/main.yml b/defaults/main.yml index d321f39..7c7cad3 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -23,6 +23,10 @@ lephare_cachetool_options: "" lephare_cachetool_retries: 10 lephare_cachetool_delay: 15 +lephare_gitlab_token: "" + +lephare_packagist_com_token: "" + lephare_rollbar_notify: false lephare_sentry_notify: false From 832261bd939c28d24ee9950954faa0bc106d34b3 Mon Sep 17 00:00:00 2001 From: Corentin Date: Thu, 4 Jul 2024 10:34:13 +0200 Subject: [PATCH 2/2] Changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ba7ece..316472d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file. See [standa ### Bug Fixes -* **private registry:** add default value for lephare_gitlab_token and lephare_packagist_com_token ([#TODO](https://github.com/le-phare/ansible-deploy/pull/TODO))([TODO](https://github.com/le-phare/ansible-deploy/pull/52/commits/72dd8ad064a212f3bca23396b738d1e9e0ce4665)) +* **private registry:** add default value for lephare_gitlab_token and lephare_packagist_com_token ([#54](https://github.com/le-phare/ansible-deploy/pull/54))([b71ddc1](https://github.com/le-phare/ansible-deploy/pull/54/commits/b71ddc15d031f0fe2fafabd0381eebf5c6a42616)) ## [1.12.1](https://github.com/le-phare/ansible-deploy/compare/v1.12.0...v1.12.1) (2024-07-03)