Skip to content

Commit ff25d87

Browse files
saltbot-opensaltbot-open
committed
Merge develop into stable for v2025.02.24 release
2 parents 12b7f81 + b5c92f7 commit ff25d87

File tree

9 files changed

+63
-64
lines changed

9 files changed

+63
-64
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -114,22 +114,6 @@ jobs:
114114

115115

116116

117-
macos-12:
118-
name: macOS 12
119-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
120-
uses: ./.github/workflows/test-macos.yml
121-
needs:
122-
- lint
123-
- generate-actions-workflow
124-
with:
125-
distro-slug: macos-12
126-
display-name: macOS 12
127-
container-slug: macos-12
128-
timeout: 20
129-
runs-on: macos-12
130-
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
131-
132-
133117
macos-13:
134118
name: macOS 13
135119
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -293,7 +277,6 @@ jobs:
293277
needs:
294278
- lint
295279
- generate-actions-workflow
296-
- macos-12
297280
- macos-13
298281
- macos-14
299282
- windows-2022

‎.github/workflows/templates/generate.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
]
2828

2929
OSX = [
30-
"macos-12",
3130
"macos-13",
3231
"macos-14",
3332
]
@@ -203,7 +202,6 @@
203202
"ubuntu-2004": "Ubuntu 20.04",
204203
"ubuntu-2204": "Ubuntu 22.04",
205204
"ubuntu-2404": "Ubuntu 24.04",
206-
"macos-12": "macOS 12",
207205
"macos-13": "macOS 13",
208206
"macos-14": "macOS 14",
209207
"windows-2022": "Windows 2022",
@@ -223,7 +221,6 @@
223221
"ubuntu-2004": "ubuntu-20.04",
224222
"ubuntu-2204": "ubuntu-22.04",
225223
"ubuntu-2404": "ubuntu-24.04",
226-
"macos-12": "macos-12",
227224
"macos-13": "macos-13",
228225
"macos-14": "macOS 14",
229226
"windows-2022": "windows-2022",

‎.github/workflows/test-macos.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ jobs:
4848
- uses: actions/checkout@v4
4949

5050
- name: Install Python Dependencies with pip breakage
51-
if: ${{ ( inputs.distro-slug != 'macos-12' ) && ( inputs.distro-slug != 'macos-13' ) }}
51+
if: ${{ inputs.distro-slug != 'macos-13' }}
5252
run: |
5353
python3 -m pip install --break-system-packages -r tests/requirements.txt
5454
5555
- name: Install Python Dependencies without pip breakage
56-
if: ${{ ( inputs.distro-slug == 'macos-12' ) || ( inputs.distro-slug == 'macos-13' ) }}
56+
if: ${{ inputs.distro-slug == 'macos-13' }}
5757
run: |
5858
python3 -m pip install -r tests/requirements.txt
5959

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ repos:
3030
- actionlint
3131

3232
- repo: https://github.com/jazzband/pip-tools
33-
rev: 7.3.0
33+
rev: 7.4.1
3434
hooks:
3535
- id: pip-compile
3636
files: ^requirements/release\.(in|txt)$

‎CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
# v2025.02.24
2+
3+
## What's Changed
4+
5+
- Update requirements to address security issues by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2073
6+
- Use treeless clone to 'shallow' clone again. by @mrichar1 in https://github.com/saltstack/salt-bootstrap/pull/2022
7+
- Fix powershell instructions by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2074
8+
- Remove support for macos-12, as deprecated by github by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2076
9+
10+
**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.12.12...v2025.02.24
11+
112
# v2024.12.12
213

314
## What's Changed

‎README.rst‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file.
3737

3838
The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is:
3939

40+
- 2024.12.12: ``7cc91adfa5a15ff57d203dc2b79608c773efc639d4e9bf03861198903e11becd``
4041
- 2024.12.09: ``44f9405a6d9622ad8fa7c93e83a52e01ca328f27e4e9dea4a52268c6a22dbe6d``
4142
- 2024.11.29: ``0ac87384dee051aceded69704485a5de0e4a308551a462b10c262111b57acff0``
4243
- 2024.11.27: ``e972bd1ef01d09cd1d9294374ef974c9e3dd9a2aee37cf3859144585fd8bf1d0``
@@ -373,7 +374,7 @@ Using ``PowerShell`` to install latest stable version:
373374
374375
[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]'Tls12'
375376
Invoke-WebRequest -Uri https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.ps1 -OutFile "$env:TEMP\bootstrap-salt.ps1"
376-
Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser & "$env:TEMP\bootstrap-salt.ps1"
377+
Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser -Force; & "$env:TEMP\bootstrap-salt.ps1"
377378
378379
Display information about the install script parameters:
379380

‎bootstrap-salt.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ if ($help) {
108108
exit 0
109109
}
110110

111-
$__ScriptVersion = "2024.12.12"
111+
$__ScriptVersion = "2025.02.24"
112112
$ScriptName = $myInvocation.MyCommand.Name
113113

114114
# We'll check for the Version next, because it also has no requirements

‎bootstrap-salt.sh‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#======================================================================================================================
2727
set -o nounset # Treat unset variables as an error
2828

29-
__ScriptVersion="2024.12.12"
29+
__ScriptVersion="2025.02.24"
3030
__ScriptName="bootstrap-salt.sh"
3131

3232
__ScriptFullName="$0"
@@ -2161,21 +2161,19 @@ __git_clone_and_checkout() {
21612161
fi
21622162

21632163
if [ "$__SHALLOW_CLONE" -eq $BS_TRUE ]; then
2164-
# Let's try shallow cloning to speed up.
2165-
# Test for "--single-branch" option introduced in git 1.7.10, the minimal version of git where the shallow
2164+
# Let's try 'treeless' cloning to speed up. Treeless cloning omits trees and blobs ('files')
2165+
# but includes metadata (commit history, tags, branches etc.
2166+
# Test for "--filter" option introduced in git 2.19, the minimal version of git where the treeless
21662167
# cloning we need actually works
2167-
if [ "$(git clone 2>&1 | grep 'single-branch')" != "" ]; then
2168-
# The "--single-branch" option is supported, attempt shallow cloning
2168+
if [ "$(git clone 2>&1 | grep 'filter')" != "" ]; then
2169+
# The "--filter" option is supported: attempt treeless cloning
21692170
echoinfo "Attempting to shallow clone $GIT_REV_ADJ from Salt's repository ${_SALT_REPO_URL}"
2170-
## Shallow cloning is resulting in the wrong version of Salt, even with a depth of 5
2171-
## getting 3007.0+0na.246d066 when it should be 3007.1+410.g246d066457, disabling for now
2172-
## if git clone --depth 1 --branch "$GIT_REV_ADJ" "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME"; then
2173-
echodebug "git command, git clone --branch $GIT_REV_ADJ $_SALT_REPO_URL $__SALT_CHECKOUT_REPONAME"
2174-
if git clone --branch "$GIT_REV_ADJ" "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME"; then
2171+
echodebug "git command, git clone --filter=tree:0 --branch $GIT_REV_ADJ $_SALT_REPO_URL $__SALT_CHECKOUT_REPONAME"
2172+
if git clone --filter=tree:0 --branch "$GIT_REV_ADJ" "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME"; then
21752173
# shellcheck disable=SC2164
21762174
cd "${_SALT_GIT_CHECKOUT_DIR}"
21772175
__SHALLOW_CLONE=$BS_TRUE
2178-
echoinfo "shallow path (disabled shallow) git cloned $GIT_REV_ADJ, version $(python3 salt/version.py)"
2176+
echoinfo "shallow path git cloned $GIT_REV_ADJ, version $(python3 salt/version.py)"
21792177
else
21802178
# Shallow clone above failed(missing upstream tags???), let's resume the old behaviour.
21812179
echowarn "Failed to shallow clone."

‎requirements/release.txt‎

Lines changed: 37 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,31 @@
44
#
55
# pip-compile requirements/release.in
66
#
7-
attrs==23.1.0
7+
annotated-types==0.7.0
8+
# via pydantic
9+
attrs==24.3.0
810
# via python-tools-scripts
9-
boto3==1.28.79
11+
boto3==1.35.98
1012
# via -r requirements/release.in
11-
botocore==1.31.79
13+
botocore==1.35.98
1214
# via
1315
# boto3
1416
# s3transfer
15-
certifi==2023.7.22
17+
certifi==2024.12.14
1618
# via requests
1719
cfgv==3.4.0
1820
# via pre-commit
19-
charset-normalizer==3.3.2
21+
charset-normalizer==3.4.1
2022
# via requests
21-
distlib==0.3.7
23+
distlib==0.3.9
2224
# via virtualenv
23-
filelock==3.13.1
24-
# via virtualenv
25-
identify==2.5.31
25+
filelock==3.16.1
26+
# via
27+
# python-tools-scripts
28+
# virtualenv
29+
identify==2.6.5
2630
# via pre-commit
27-
idna==3.4
31+
idna==3.10
2832
# via requests
2933
jmespath==1.0.1
3034
# via
@@ -34,36 +38,41 @@ markdown-it-py==3.0.0
3438
# via rich
3539
mdurl==0.1.2
3640
# via markdown-it-py
37-
nodeenv==1.8.0
41+
nodeenv==1.9.1
3842
# via pre-commit
39-
platformdirs==3.11.0
43+
platformdirs==4.3.6
4044
# via virtualenv
41-
pre-commit==3.5.0
45+
pre-commit==4.0.1
4246
# via -r requirements/release.in
43-
pygments==2.16.1
47+
pydantic==2.10.5
48+
# via python-tools-scripts
49+
pydantic-core==2.27.2
50+
# via pydantic
51+
pygments==2.19.1
4452
# via rich
45-
python-dateutil==2.8.2
53+
python-dateutil==2.9.0.post0
4654
# via botocore
47-
python-tools-scripts==0.18.6
55+
python-tools-scripts==0.20.5
4856
# via -r requirements/release.in
49-
pyyaml==6.0.1
57+
pyyaml==6.0.2
5058
# via pre-commit
51-
requests==2.31.0
59+
requests==2.32.3
5260
# via python-tools-scripts
53-
rich==13.6.0
61+
rich==13.9.4
5462
# via python-tools-scripts
55-
s3transfer==0.7.0
63+
s3transfer==0.10.4
5664
# via boto3
57-
six==1.16.0
65+
six==1.17.0
5866
# via python-dateutil
59-
typing-extensions==4.8.0
60-
# via python-tools-scripts
61-
urllib3==2.0.7
67+
typing-extensions==4.12.2
68+
# via
69+
# pydantic
70+
# pydantic-core
71+
# python-tools-scripts
72+
# rich
73+
urllib3==2.3.0
6274
# via
6375
# botocore
6476
# requests
65-
virtualenv==20.24.6
77+
virtualenv==20.28.1
6678
# via pre-commit
67-
68-
# The following packages are considered to be unsafe in a requirements file:
69-
# setuptools

0 commit comments

Comments
 (0)