From 5abe99568afe9ea4ce6c91b801115dd78e5a0695 Mon Sep 17 00:00:00 2001 From: Emilien M Date: Fri, 19 Apr 2019 14:36:20 +0200 Subject: [PATCH] Support Debian Buster (#11) --- .travis.yml | 2 ++ README.md | 1 + Vagrantfile | 2 ++ meta/main.yml | 1 + tasks/main.yml | 5 +++++ vars/Debian-buster.yml | 1 + 6 files changed, 12 insertions(+) create mode 100644 vars/Debian-buster.yml diff --git a/.travis.yml b/.travis.yml index 6bc3f12..abd8b34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ env: - PLATFORM='docker-debian-stretch-php71' ANSIBLE_VERSION='ansible>=2.6,<2.7' - PLATFORM='docker-debian-stretch-php72' ANSIBLE_VERSION='ansible>=2.6,<2.7' - PLATFORM='docker-debian-stretch-php73' ANSIBLE_VERSION='ansible>=2.6,<2.7' + - PLATFORM='docker-debian-buster-php73' ANSIBLE_VERSION='ansible>=2.6,<2.7' - PLATFORM='docker-ubuntu-xenial-php70' ANSIBLE_VERSION='ansible>=2.6,<2.7' - PLATFORM='docker-ubuntu-bionic-php72' ANSIBLE_VERSION='ansible>=2.6,<2.7' - PLATFORM='docker-ubuntu-bionic-php72' ANSIBLE_VERSION='ansible>=2.6,<2.7' @@ -10,6 +11,7 @@ env: - PLATFORM='docker-debian-stretch-php71' ANSIBLE_VERSION='ansible>=2.7,<2.8' - PLATFORM='docker-debian-stretch-php72' ANSIBLE_VERSION='ansible>=2.7,<2.8' - PLATFORM='docker-debian-stretch-php73' ANSIBLE_VERSION='ansible>=2.7,<2.8' + - PLATFORM='docker-debian-buster-php73' ANSIBLE_VERSION='ansible>=2.7,<2.8' - PLATFORM='docker-ubuntu-xenial-php70' ANSIBLE_VERSION='ansible>=2.7,<2.8' - PLATFORM='docker-ubuntu-bionic-php72' ANSIBLE_VERSION='ansible>=2.7,<2.8' - PLATFORM='docker-ubuntu-bionic-php72' ANSIBLE_VERSION='ansible>=2.7,<2.8' diff --git a/README.md b/README.md index acf997d..07212cf 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ Managed OS / Versions | OS | PHP 7.0 | PHP 7.1 | PHP 7.2 | PHP 7.3 | |:---------------------:|:-------------------:|:--------------------------:|:--------------------------:|:-------------------------:| | Debian Stretch (9) | :heavy_check_mark: | :heavy_check_mark: (Sury) | :heavy_check_mark: (Sury) | :heavy_check_mark: (Sury) | +| Debian Buster (10) | :x: | :x: | :x: | :heavy_check_mark: | | Ubuntu Xenial (16.04) | :heavy_check_mark: | :x: | :x: | :x: | | Ubuntu Bionic (18.04) | :x: | :x: | :heavy_check_mark: | :x: | | FreeBSD 11 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | diff --git a/Vagrantfile b/Vagrantfile index a82317d..2ceb8d1 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -10,6 +10,7 @@ Vagrant.configure("2") do |config| { :name => "debian-stretch-php71", :box => "debian/stretch64", :vars => { "php_version": '7.1' }}, { :name => "debian-stretch-php72", :box => "debian/stretch64", :vars => { "php_version": '7.2' }}, { :name => "debian-stretch-php73", :box => "debian/stretch64", :vars => { "php_version": '7.3' }}, + { :name => "debian-buster-php73", :box => "debian/buster64", :vars => { }}, { :name => "ubuntu-xenial-php70", :box => "ubuntu/xenial64", :vars => { }}, { :name => "ubuntu-bionic-php72", :box => "ubuntu/bionic64", :vars => { }}, ] @@ -24,6 +25,7 @@ Vagrant.configure("2") do |config| { :name => "docker-debian-stretch-php71", :docker => "hanxhx/vagrant-ansible:debian9", :vars => { "php_version": '7.1' }}, { :name => "docker-debian-stretch-php72", :docker => "hanxhx/vagrant-ansible:debian9", :vars => { "php_version": '7.2' }}, { :name => "docker-debian-stretch-php73", :docker => "hanxhx/vagrant-ansible:debian9", :vars => { "php_version": '7.3' }}, + { :name => "docker-debian-buster-php73", :docker => "hanxhx/vagrant-ansible:debian10", :vars => { }}, { :name => "docker-ubuntu-xenial-php70", :docker => "hanxhx/vagrant-ansible:ubuntu16.04", :vars => { }}, { :name => "docker-ubuntu-bionic-php72", :docker => "hanxhx/vagrant-ansible:ubuntu18.04", :vars => { }}, ] diff --git a/meta/main.yml b/meta/main.yml index 476f289..9469381 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -9,6 +9,7 @@ galaxy_info: - name: Debian versions: - stretch + - buster - name: Ubuntu versions: - xenial diff --git a/tasks/main.yml b/tasks/main.yml index f052bfa..11187b3 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,5 +1,10 @@ --- +- name: SET_FACT | Bypass https://github.com/ansible/ansible/issues/19874 + set_fact: + ansible_distribution_release: 'buster' + when: ansible_facts.distribution_major_version == "buster/sid" + - name: INCLUDE_VARS | Related to OS family include_vars: "OS_Family_{{ ansible_os_family }}.yml" diff --git a/vars/Debian-buster.yml b/vars/Debian-buster.yml new file mode 100644 index 0000000..7733368 --- /dev/null +++ b/vars/Debian-buster.yml @@ -0,0 +1 @@ +php_default_version: '7.3'