Merge pull request #1503 from s0undt3ch/develop

Updates for release
This commit is contained in:
Pedro Algarvio 2020-10-19 12:32:32 +01:00 committed by GitHub
commit c7ddfb41ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 108 additions and 6 deletions

49
.github/workflows/checksums.yml vendored Normal file
View file

@ -0,0 +1,49 @@
name: Checksums
on:
push:
tags:
- '*'
jobs:
checksums:
name: Update Release Checksums
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
ref: stable
- name: Get bootstrap-salt.sh sha256sum
run: |
echo "SH=$(sha256sum bootstrap-salt.sh | awk '{ print $1 }')" >> $GITHUB_ENV
echo "PS1=$(sha256sum bootstrap-salt.ps1 | awk '{ print $1 }')" >> $GITHUB_ENV
echo "BS_VERSION=$(sh bootstrap-salt.sh -v | awk '{ print $4 }')" >> $GITHUB_ENV
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Update Checksums
run: |
echo ${{ env.SH }} > bootstrap-salt.sh.sha256
echo ${{ env.PS1 }} > bootstrap-salt.ps1.sha256
git config --global user.name 'SaltStack GH Automation'
git config --global user.email 'actions@github.com'
git add *.sha256
git commit -am "Update sha256 checksums"
git push
- uses: actions/checkout@v2
with:
ref: develop
- name: Update Latest Release on README
run: |
python3 .github/workflows/scripts/update-release-shasum.py ${{ env.BS_VERSION }} ${{ env.SH }}
git config --global user.name 'SaltStack GH Automation'
git config --global user.email 'actions@github.com'
git commit -am "Update README.rst with latest release sha256sum"
git push

View file

@ -0,0 +1,37 @@
#!/usr/bin/env python
import sys
import pathlib
THIS_FILE = pathlib.Path(__file__).resolve()
CODE_ROOT = THIS_FILE.parent.parent.parent.parent
README_PATH = CODE_ROOT / "README.rst"
def main(version, sha256sum):
in_contents = README_PATH.read_text()
out_contents = ""
found_anchor = False
updated_version = False
if version not in in_contents:
for line in in_contents.splitlines(True):
if updated_version:
out_contents += line
continue
if found_anchor:
if not line.startswith("-"):
out_contents += line
continue
out_contents += "- {}: ``{}``\n".format(version, sha256sum)
out_contents += line
updated_version = True
continue
out_contents += line
if line.startswith(".. _sha256sums:"):
found_anchor = True
if in_contents != out_contents:
README_PATH.write_text(out_contents)
if __name__ == '__main__':
main(sys.argv[1], sys.argv[2])

View file

@ -77,6 +77,7 @@ Guillaume Derval GuillaumeDerval guillaume@guillaumederval.be
gweis gweis
Henrik Holmboe holmboe
Howard Mei HowardMei howardleomei@gmail.com
Ivo Jánský ijansky
James Booth absolutejam vvalentine1337@gmail.com
Jamie Alessio jalessio jamie@stoic.net
Jan Heidbrink jheidbrink
@ -98,6 +99,7 @@ Ken Crowell oeuftete kcrowell@saltstack.com
Kenneth Wilke KennethWilke
Kevin Quinn kevinquinnyo kevin.quinn@totalserversolutions.com
kiemlicz kiemlicz
Kirill Ponomarev krionbsd krion@freebsd.org
Ky-Anh Huynh icy
Liu Xiaohui oreh herolxh@gmail.com
lomeroe lomeroe
@ -116,6 +118,7 @@ Matthew Mead-Briggs mattmb
Matthew Richardson mrichar1
Matthew Willson ixela
Matthieu Guegan mguegan
Max Arnold max-arnold
Megan Wilhite Ch3LL megan.wilhite@gmail.com
mfapouw mfapouw
Michael A. Smith kojiromike michaels@syapse.com
@ -129,6 +132,7 @@ nevins-b nevins-b
Nicholas Henry nshenry03 nshenry03@gmail.com
Nicole Thomas rallytime nicole@saltstack.com
Niels Abspoel aboe76 aboe76@gmail.com
Nikita mbochenk
Nitin Madhok nmadhok nmadhok@clemson.edu
panticz panticz
Paul Brian lifeisstillgood paul@mikadosoftware.com
@ -164,6 +168,7 @@ stanzgy stanzgy stanzgy@gmail.com
Steve Groesz wolfpackmars2 wolfpackmars2@yahoo.com
Sven R hackacad admin@hackacad.net
sybix sybix
Tai Groot taigrr tai@taigrr.com
Tate Eskew tateeskew
Thomas S. Hatch thatch45 thatch45@saltstack.com
Tobias Jungel toanju Tobias.Jungel@gmail.com

View file

@ -1,5 +1,14 @@
Version TBD (In Progress on the Develop Branch):
Version 2020.10.19:
* Fix v3000+ with git install on FreeBSD (krionbsd) #1487
* Update README giving ONE example of WINDOWS bootstrapping. Default to python3 instead of
python2. (noelmcloughlin) #1496
* Support git and stable salt-bootstrap on Gentoo. (ijansky) #1500
* Add support for Linux Mint 20. (taigrr) #1502
* Adding missing functions for Red Hat 8. (mbochenk) #1489
* Allow pinning minor 3xxx versions. (max-arnold) #1491
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
@ -38,8 +47,8 @@ Version 2020.02.04:
* Drop support for Debian < 8 (s0undt3ch) #1424
Version 2020.01.29:
* FreeBSD fixes (cedwards) #1413
* Support the upcoming Neon release (s0undt3ch) #1420
* FreeBSD fixes (cedwards) #1413
* Support the upcoming Neon release (s0undt3ch) #1420
Version 2020.01.21:
* FreeBSD fixes (kgbsd) #1376

View file

@ -28,6 +28,8 @@ Bootstrap
In every two-step installation example, you would be well-served to **verify against the SHA256
sum** of the downloaded ``bootstrap-salt.sh`` file.
.. _sha256sums:
The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is:
- 2020.06.23: ``1d07db867c195c864d0ae70664524f2099cc9a46872953293c67c3f239d4f4f5``
@ -498,8 +500,8 @@ Make edits to .drone.jsonnet and then save them into the .drone.yml by doing the
.. _Vagrant: http://www.vagrantup.com
.. _hardening salt: https://docs.saltstack.com/en/latest/topics/hardening.html
.. |build| image:: https://drone.saltstack.com/api/badges/saltstack/salt-bootstrap/status.svg
:target: https://drone.saltstack.com/saltstack/salt-bootstrap
:alt: Build status on Linux
.. |build| image:: https://github.com/saltstack/salt-bootstrap/workflows/Testing/badge.svg?branch=develop
:target: https://github.com/saltstack/salt-bootstrap/actions?query=branch%3Adevelop
:alt: Build Status
.. vim: fenc=utf-8 spell spl=en cc=100 tw=99 fo=want sts=2 sw=2 et

View file

@ -23,7 +23,7 @@
#======================================================================================================================
set -o nounset # Treat unset variables as an error
__ScriptVersion="2020.06.23"
__ScriptVersion="2020.10.19"
__ScriptName="bootstrap-salt.sh"
__ScriptFullName="$0"