From 8c7d605c5af80ea1e29fa1b08f61d28f40a28e10 Mon Sep 17 00:00:00 2001
From: Chris Croome <chris@webarchitects.co.uk>
Date: Tue, 19 Apr 2022 13:08:03 +0100
Subject: [PATCH] Debug test SAPI checks
---
tasks/checks.yml | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/tasks/checks.yml b/tasks/checks.yml
index 92d062d..c5b05d1 100644
--- a/tasks/checks.yml
+++ b/tasks/checks.yml
@@ -69,14 +69,6 @@
var: php_versions_remove
verbosity: 2
- - name: Include SAPI checks for PHP versions due to be removed
- include_tasks: sapi_checks.yml
- loop: "{{ php_versions_remove }}"
- loop_control:
- loop_var: version
- label: "{{ version }}"
- when: ( php_versions_remove is defined ) and ( php_versions_remove != [] )
-
- name: Generate an array of absent PHP versions
set_fact:
php_versions_absent: "{{ php_versions_absent | default([]) }} + [ '{{ absent_version.key }}' ]"
@@ -91,13 +83,25 @@
var: php_versions_absent
verbosity: 2
+ - name: Include SAPI checks for PHP versions due to be removed
+ include_tasks: sapi_checks.yml
+ loop: "{{ php_versions_remove }}"
+ loop_control:
+ loop_var: version
+ label: "{{ version }}"
+ when:
+ - ( php_versions[version].sapis is defined
+ - ( php_versions_remove is defined ) and ( php_versions_remove != [] )
+
- name: Include SAPI checks for PHP versions due to be absent
include_tasks: sapi_checks.yml
loop: "{{ php_versions_absent }}"
loop_control:
loop_var: version
label: "{{ version }}"
- when: ( php_versions_absent is defined ) and ( php_versions_absent != [] )
+ when:
+ - ( php_versions[version].sapis is defined
+ - ( php_versions_absent is defined ) and ( php_versions_absent != [] )
- name: Include SAPI checks for PHP proposed versions
include_tasks: sapi_checks.yml
--
GitLab