Skip to content

Commit

Permalink
fix: prevent running of states deprecated in v1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
nb committed Jul 24, 2019
1 parent 08cd563 commit 3dd529b
Show file tree
Hide file tree
Showing 37 changed files with 70 additions and 0 deletions.
1 change: 1 addition & 0 deletions php/adodb.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-adodb:
Expand Down
1 change: 1 addition & 0 deletions php/apc.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-apc:
Expand Down
1 change: 1 addition & 0 deletions php/apcu.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-apcu:
Expand Down
1 change: 1 addition & 0 deletions php/bcmath.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-bcmath:
Expand Down
1 change: 1 addition & 0 deletions php/cgi.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-cgi:
Expand Down
1 change: 1 addition & 0 deletions php/cli.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-cli:
Expand Down
1 change: 1 addition & 0 deletions php/composer.sls
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
{%- set salt_user_home = salt['user.info'](salt_user).get('home', '/root') %}
include:
- php.deprecated
- php
get-composer:
Expand Down
1 change: 1 addition & 0 deletions php/curl.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-curl:
Expand Down
30 changes: 30 additions & 0 deletions php/deprecated.sls
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# -*- coding: utf-8 -*-
# vim: ft=sls

php-deprecated-in-v1.0.0-test-fail:
test.succeed_without_changes:
- name: |
################################################################################
# #
# WARNING: BREAKING CHANGES SINCE `v1.0.0` #
# #
################################################################################
# #
# Prior to `v1.0.0`, this formula provided two methods for managing php; the #
# old method under `php` and the new method under `php.ng`. The old method #
# has now been removed and `php.ng` has been promoted to be `PHP` in its #
# place. #
# #
# If you are not in a position to migrate, please pin your repo to the final #
# release tag before `v1.0.0`, i.e. `v0.37.1`. #
# #
# To migrate from `php.ng`, simply modify your pillar to promote the entire #
# section under `php:ng` so that it is under `php` instead. So with the #
# editor of your choice, highlight the entire section and then unindent one #
# level. Finish by removing the `ng:` line. #
# #
# To migrate from the old `php`, first convert to `php.ng` under `v0.37.0` #
# and then follow the steps laid out in the paragraph directly above. #
# #
################################################################################
# - failhard: True
1 change: 1 addition & 0 deletions php/dev.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-dev:
Expand Down
3 changes: 3 additions & 0 deletions php/fpm.sls
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
php-fpm:
pkg.installed:
- name: {{ php.fpm_pkg }}
Expand Down
1 change: 1 addition & 0 deletions php/gd.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-gd:
Expand Down
1 change: 1 addition & 0 deletions php/imagick.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-imagick:
Expand Down
1 change: 1 addition & 0 deletions php/imap.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-imap:
Expand Down
3 changes: 3 additions & 0 deletions php/init.sls
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
{%- if not 'ng' in salt['pillar.get']('php', {}) %}
{%- if grains['os'] == "Ubuntu" %}
Expand Down
1 change: 1 addition & 0 deletions php/intl.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-intl:
Expand Down
1 change: 1 addition & 0 deletions php/json.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-json:
Expand Down
1 change: 1 addition & 0 deletions php/ldap.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-ldap:
Expand Down
1 change: 1 addition & 0 deletions php/mail.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-mail:
Expand Down
1 change: 1 addition & 0 deletions php/mbstring.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-mbstring:
Expand Down
1 change: 1 addition & 0 deletions php/mcrypt.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-mcrypt:
Expand Down
1 change: 1 addition & 0 deletions php/memcache.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-memcache:
Expand Down
1 change: 1 addition & 0 deletions php/memcached.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-memcached:
Expand Down
1 change: 1 addition & 0 deletions php/mongo.sls
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
{%- set version = salt['pillar.get']('php:mongo_version', none) %}
include:
- php.deprecated
- php
- php.xml
- php.dev
Expand Down
1 change: 1 addition & 0 deletions php/mysql.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-mysql:
Expand Down
1 change: 1 addition & 0 deletions php/mysqlnd.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-mysqlnd:
Expand Down
1 change: 1 addition & 0 deletions php/oauth.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-oauth:
Expand Down
1 change: 1 addition & 0 deletions php/pear.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-pear:
Expand Down
1 change: 1 addition & 0 deletions php/pgsql.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-pgsql:
Expand Down
1 change: 1 addition & 0 deletions php/readline.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-readline:
Expand Down
1 change: 1 addition & 0 deletions php/redis.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-redis:
Expand Down
1 change: 1 addition & 0 deletions php/soap.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-soap:
Expand Down
1 change: 1 addition & 0 deletions php/sqlite.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-sqlite:
Expand Down
1 change: 1 addition & 0 deletions php/suhosin.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
- php.dev
Expand Down
1 change: 1 addition & 0 deletions php/sybase.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-sybase:
Expand Down
1 change: 1 addition & 0 deletions php/xml.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-xml:
Expand Down
1 change: 1 addition & 0 deletions php/zip.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{%- from "php/map.jinja" import php with context %}
include:
- php.deprecated
- php
php-zip:
Expand Down

0 comments on commit 3dd529b

Please sign in to comment.