From 0c15f053167cbf6e4bbc2f95ce6352dbb2297354 Mon Sep 17 00:00:00 2001 From: Jeremy Price Date: Thu, 11 Jan 2024 16:27:03 -0800 Subject: [PATCH 1/6] Initial upgrade_requirements.json file for fetching before upgrades, to check major prereqs -- mainly php -- before pulling down new, possibly breaking, code. --- upgrade_requirements.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 upgrade_requirements.json diff --git a/upgrade_requirements.json b/upgrade_requirements.json new file mode 100644 index 000000000..c71755cf4 --- /dev/null +++ b/upgrade_requirements.json @@ -0,0 +1,10 @@ +{ + "v6": { + "php_min_version": "7.4.0", + "php_max_major": "8.1" + }, + "v7": { + "php_min_version": "8.1.0", + "php_max_major": "8.2" + } +} From d12e571b20db85968b9c056a63d089b1ef171e6b Mon Sep 17 00:00:00 2001 From: Jeremy Price Date: Thu, 11 Jan 2024 16:32:17 -0800 Subject: [PATCH 2/6] undoing versioning.. doesn't make sense --- upgrade_requirements.json | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/upgrade_requirements.json b/upgrade_requirements.json index c71755cf4..8fb9a457b 100644 --- a/upgrade_requirements.json +++ b/upgrade_requirements.json @@ -1,10 +1,4 @@ { - "v6": { - "php_min_version": "7.4.0", - "php_max_major": "8.1" - }, - "v7": { - "php_min_version": "8.1.0", - "php_max_major": "8.2" - } + "php_min_version": "8.1.0", + "php_max_major": "8.2" } From 55943dbff6d106d3dd8c70788aa494b5443a208f Mon Sep 17 00:00:00 2001 From: Jeremy Price Date: Thu, 11 Jan 2024 16:47:47 -0800 Subject: [PATCH 3/6] add comments and php_max_wontwork because that's what we use rigth now and MVP, dammit --- upgrade_requirements.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/upgrade_requirements.json b/upgrade_requirements.json index 8fb9a457b..b46ce5255 100644 --- a/upgrade_requirements.json +++ b/upgrade_requirements.json @@ -1,4 +1,9 @@ { + "DOC1": "This file is meant to be pulled from the current HEAD of the desired branch, NOT referenced locally", + "DOC2": "In other words, what you see locally are the requirements for your _current_ install", + "DOC3": "Please don't rely on these versions for planning upgrades unless you've fetched the most recent version", + "DOC4": "You should really just ignore it and tun upgrade.php. Really", "php_min_version": "8.1.0", - "php_max_major": "8.2" + "php_max_major": "8.2", + "php_max_wontwork": "8.3.0" } From 5fdcd6298f312cad4f394e2f94aae9356a22f092 Mon Sep 17 00:00:00 2001 From: Jeremy Price Date: Thu, 11 Jan 2024 16:50:16 -0800 Subject: [PATCH 4/6] rename php_max_major, because it's not.. it's major_minor, even if it sounds ridiculous --- upgrade_requirements.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upgrade_requirements.json b/upgrade_requirements.json index b46ce5255..df55b859c 100644 --- a/upgrade_requirements.json +++ b/upgrade_requirements.json @@ -4,6 +4,6 @@ "DOC3": "Please don't rely on these versions for planning upgrades unless you've fetched the most recent version", "DOC4": "You should really just ignore it and tun upgrade.php. Really", "php_min_version": "8.1.0", - "php_max_major": "8.2", + "php_max_major_minor": "8.2", "php_max_wontwork": "8.3.0" } From fe0bba6df6d475f048391892928e39ba896212a4 Mon Sep 17 00:00:00 2001 From: Jeremy Price Date: Thu, 11 Jan 2024 16:52:39 -0800 Subject: [PATCH 5/6] rename upgrade requirements file and add snipeit version differentiation the latter mostly for testing and san checking.. but it doesn't really matter because it's just json.. if we don't use it we don't use it --- upgrade_requirements.json => .upgrade_requirements.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename upgrade_requirements.json => .upgrade_requirements.json (87%) diff --git a/upgrade_requirements.json b/.upgrade_requirements.json similarity index 87% rename from upgrade_requirements.json rename to .upgrade_requirements.json index df55b859c..b39383a7f 100644 --- a/upgrade_requirements.json +++ b/.upgrade_requirements.json @@ -5,5 +5,6 @@ "DOC4": "You should really just ignore it and tun upgrade.php. Really", "php_min_version": "8.1.0", "php_max_major_minor": "8.2", - "php_max_wontwork": "8.3.0" + "php_max_wontwork": "8.3.0", + "current_snipeit_version": "6.3" } From 58b2f8ca174557a02dce33ffa5ad9366dc4861e3 Mon Sep 17 00:00:00 2001 From: Jeremy Price Date: Thu, 11 Jan 2024 19:12:24 -0800 Subject: [PATCH 6/6] typo --- .upgrade_requirements.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.upgrade_requirements.json b/.upgrade_requirements.json index b39383a7f..43d769728 100644 --- a/.upgrade_requirements.json +++ b/.upgrade_requirements.json @@ -2,7 +2,7 @@ "DOC1": "This file is meant to be pulled from the current HEAD of the desired branch, NOT referenced locally", "DOC2": "In other words, what you see locally are the requirements for your _current_ install", "DOC3": "Please don't rely on these versions for planning upgrades unless you've fetched the most recent version", - "DOC4": "You should really just ignore it and tun upgrade.php. Really", + "DOC4": "You should really just ignore it and run upgrade.php. Really", "php_min_version": "8.1.0", "php_max_major_minor": "8.2", "php_max_wontwork": "8.3.0",