From 4f584b912f6beca5948974ba1deae317b6a3bebd Mon Sep 17 00:00:00 2001 From: Bryce Larson Date: Tue, 23 Jun 2020 13:02:57 -0600 Subject: [PATCH] make 2020.06.23 release --- AUTHORS.rst | 4 +++- ChangeLog | 11 +++++++++++ README.rst | 4 ++++ RELEASE.md | 12 ++++++++++++ bootstrap-salt.sh | 2 +- 5 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 RELEASE.md diff --git a/AUTHORS.rst b/AUTHORS.rst index 56f90c0..e5afa15 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -30,7 +30,7 @@ Brandon Clifford brandon099 brandon.clifford@vivint.com Bret Fisher BretFisher bret@fishbrains.com Brian Kruger bkruger99 brian.kruger@elliemae.com bruce-one bruce-one -Bryce Larson bryceml +Bryce Larson bryceml blarson@saltstack.com C. R. Oldham cro cr@saltstack.com Cam camereonsparr Charles McLaughlin cmclaughlin @@ -45,6 +45,7 @@ Dan Mick dmick dan.mick@inktank.com Daniel Poelzleithner poelzi Daniel Wallace gtmanfred danielwallace@gtmanfred.com Darko Cerdic darkocerdic +Daryl Turner darylturner d.turner@arkadin.com David J. Felix DavidJFelix denmat denmat Denys Havrysh vutny denys.gavrysh@gmail.com @@ -77,6 +78,7 @@ gweis gweis Henrik Holmboe holmboe Howard Mei HowardMei howardleomei@gmail.com James Booth absolutejam vvalentine1337@gmail.com +Jamie Alessio jalessio jamie@stoic.net Jan Heidbrink jheidbrink Jared Bristow jars99 Jared E Stroud jaredestroud jaredestroud@gmail.com diff --git a/ChangeLog b/ChangeLog index 8b9230e..9159fc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ Version TBD (In Progress on the Develop Branch): +Version 2020.06.23: + * Fix for Cumulus Linux 4.1 (darylturner) #1474 + * Fix file download exit code, improve error message on failed download (bryceml) #1478 + * Add support for Ubuntu 20.04 (bryceml) #1479 + * Default Ubuntu 20.04 to Py3 since there isn't a Py2 release for it (bryceml) #1480 + * Warn instead of exit when using -R and -x python3 on centos to allow installing python3 + versions of salt on centos from other repos. Old unsupported releases probably need to + manually install epel-release before running the bootstrap script for versions before 2018.3.5 + and before 2019.2.1 (bryceml) #1482 + * Start maintaining .sha256 files for the bootstrap script + Version 2020.05.28: * Fix Opensuse Tumbleweed (noelmcloughlin) #1441 * Remove Debian 8 from Python 3 supported list (jay1648) #1448 diff --git a/README.rst b/README.rst index 567c7cc..9ee048d 100644 --- a/README.rst +++ b/README.rst @@ -50,6 +50,10 @@ The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is: If you're looking for a *one-liner* to install Salt, please scroll to the bottom and use the instructions for `Installing via an Insecure One-Liner`_. +There are also .sha256 files for verifying against in the repo for the stable branch. You can also +get the correct sha256 sum for the stable release from https://bootstrap.saltstack.com/sha256 and +https://winbootstrap.saltstack.com/sha256 + Contributing ------------ diff --git a/RELEASE.md b/RELEASE.md new file mode 100644 index 0000000..808d8f5 --- /dev/null +++ b/RELEASE.md @@ -0,0 +1,12 @@ +# Release process + +- See if there are any PRs worth squeezing into release. +- Go through the changes since last release, add them to changelog. +- Add any new authors to the AUTHORS file. +- Bump version for release +- Open PR against develop with these changes. +- Once the above PR is merged, open a PR against master with the changes from develop +- Add a commit on that PR for updating the .sha256 files +- Once the PR against master is merged, update shasums on README on the develop branch +- Open a PR against salt with the new stable release. +- Open a PR against kitchen-salt with the new stable release. diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index fb3fc23..8c6af88 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -23,7 +23,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2020.05.28" +__ScriptVersion="2020.06.23" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0"