Skip to content

Commit 816d2d5

Browse files
nychefnychef
authored
Merge branch 'master' into win_task-v1
2 parents 6ddb68f + f4db526 commit 816d2d5

207 files changed

Lines changed: 17717 additions & 17684 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/actions/build-onedir-deps/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ runs:
3131
run: |
3232
HASH=$(python3 .github/scripts/hash-files.py \
3333
'.relenv/**/*.xz' \
34-
'requirements/static/pkg/*/*.txt' \
34+
'requirements/static/pkg/*/*.lock' \
3535
'tools/pkg/build.py' \
3636
'.github/actions/build-onedir-deps/action.yml' \
3737
'.github/workflows/build-deps-onedir-*.yml' \

‎.github/actions/build-onedir-salt/action.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ runs:
4646
shell: bash
4747
env:
4848
RELENV_BUILDENV: "1"
49+
SALT_VERSION: "${{ inputs.salt-version }}"
4950
run: |
5051
tools pkg build salt-onedir salt-${{ inputs.salt-version }}.tar.gz --platform ${{ inputs.platform }} --package-name artifacts/${{ inputs.package-name }}
5152

‎.github/actions/build-source-tarball/action.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ runs:
3737
3838
- name: Create Source Tarball
3939
shell: bash
40+
env:
41+
SALT_VERSION: "${{ inputs.salt-version }}"
4042
run: |
43+
echo "${{ inputs.salt-version }}" > salt/_version.txt
4144
tools pkg source-tarball
4245
4346
- name: Create Hash Files

‎.github/actions/setup-python-tools-scripts/action.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ runs:
3131
id: venv-hash
3232
shell: bash
3333
run: |
34-
FILES_HASH=$(python3 .github/scripts/hash-files.py 'requirements/**/*.txt' 'tools/**/*.py')
34+
FILES_HASH=$(python3 .github/scripts/hash-files.py 'requirements/**/*.in' 'requirements/**/*.lock' 'tools/**/*.py')
3535
VENV_NAME_HASH=$(echo "${{ inputs.cache-prefix }}|${{ github.workflow }}|${{
3636
steps.get-python-version.outputs.version-sha256sum }}|${FILES_HASH}" | sha256sum | cut -d ' ' -f 1)
3737
echo "TOOLS_VIRTUALENV_CACHE_SEED=$VENV_NAME_HASH" | tee -a "${GITHUB_ENV}"
@@ -58,10 +58,10 @@ runs:
5858
(${PYTHON_EXE} -m pip install --help | grep break-system-packages > /dev/null 2>&1) && exitcode=0 || exitcode=1
5959
if [ $exitcode -eq 0 ]; then
6060
${PYTHON_EXE} -m pip install --break-system-packages --upgrade setuptools
61-
${PYTHON_EXE} -m pip install --break-system-packages -r requirements/static/ci/py${{ steps.get-python-version.outputs.version }}/tools.txt
61+
${PYTHON_EXE} -m pip install --break-system-packages -r requirements/static/ci/py${{ steps.get-python-version.outputs.version }}/tools.lock
6262
else
6363
${PYTHON_EXE} -m pip install --upgrade setuptools
64-
${PYTHON_EXE} -m pip install -r requirements/static/ci/py${{ steps.get-python-version.outputs.version }}/tools.txt
64+
${PYTHON_EXE} -m pip install -r requirements/static/ci/py${{ steps.get-python-version.outputs.version }}/tools.lock
6565
fi
6666
6767
- name: Get 'python-tools-scripts' Version

‎.github/dependabot.yml‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,19 @@
11
version: 2
22
updates:
3-
# master branch
43
- package-ecosystem: "pip"
54
directory: "/"
65
schedule:
76
interval: "daily"
87
target-branch: master
98
labels:
109
- "test:full"
11-
# Don't open PRs for regular version updates
12-
open-pull-requests-limit: 0
10+
open-pull-requests-limit: 5
1311

14-
# 3006.x release branch
1512
- package-ecosystem: "pip"
1613
directory: "/"
1714
schedule:
1815
interval: "daily"
1916
target-branch: 3006.x
2017
labels:
2118
- "test:full"
22-
# Don't open PRs for regular version updates
23-
open-pull-requests-limit: 0
24-
25-
# freeze release branch
26-
- package-ecosystem: "pip"
27-
directory: "/"
28-
schedule:
29-
interval: "daily"
30-
target-branch: freeze
31-
labels:
32-
- "test:full"
33-
# Don't open PRs for regular version updates
34-
open-pull-requests-limit: 0
19+
open-pull-requests-limit: 5

‎.github/scripts/hash-files.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
python hash-files.py 'pattern1' 'pattern2' ...
1010
1111
Example:
12-
python hash-files.py 'requirements/**/*.txt' 'noxfile.py'
12+
python hash-files.py 'requirements/**/*' 'noxfile.py'
1313
"""
1414
import hashlib
1515
import sys
@@ -21,7 +21,7 @@ def find_files(patterns):
2121
Find all files matching the given glob patterns.
2222
2323
Args:
24-
patterns: List of glob patterns (e.g., 'requirements/**/*.txt')
24+
patterns: List of glob patterns (e.g., 'requirements/**/*')
2525
2626
Returns:
2727
Sorted list of Path objects for matching files
@@ -122,7 +122,7 @@ def main():
122122
print("Usage: python hash-files.py 'pattern1' 'pattern2' ...", file=sys.stderr)
123123
print("", file=sys.stderr)
124124
print(
125-
"Example: python hash-files.py 'requirements/**/*.txt' 'noxfile.py'",
125+
"Example: python hash-files.py 'requirements/**/*' 'noxfile.py'",
126126
file=sys.stderr,
127127
)
128128
sys.exit(1)

‎.github/workflows/build-deps-ci-action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jobs:
117117
- name: PyPi Proxy
118118
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
119119
run: |
120-
sed -i '7s;^;--index-url=${{ vars.PIP_INDEX_URL }} --trusted-host ${{ vars.PIP_TRUSTED_HOST }} --extra-index-url=${{ vars.PIP_EXTRA_INDEX_URL }}\n;' requirements/static/ci/*/*.txt
120+
sed -i '7s;^;--index-url=${{ vars.PIP_INDEX_URL }} --trusted-host ${{ vars.PIP_TRUSTED_HOST }} --extra-index-url=${{ vars.PIP_EXTRA_INDEX_URL }}\n;' requirements/static/ci/*/*.lock
121121
122122
- name: Setup Python Tools Scripts
123123
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'

‎.github/workflows/build-docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
id: docs-requirements-hash
7474
shell: bash
7575
run: |
76-
HASH=$(python3 .github/scripts/hash-files.py 'requirements/**/docs.txt')
76+
HASH=$(python3 .github/scripts/hash-files.py 'requirements/**/docs.lock')
7777
echo "hash=${HASH}" | tee -a "$GITHUB_OUTPUT"
7878
7979
- name: Cache Python Tools Docs Virtualenv

‎.github/workflows/build-packages.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,12 @@ jobs:
166166
working-directory: pkgs/checkout/
167167
run: |
168168
tools pkg apply-release-patch salt-${{ inputs.salt-version }}.patch --delete
169+
echo "${{ inputs.salt-version }}" > salt/_version.txt
169170
170171
- name: Build Deb
171172
working-directory: pkgs/checkout/
173+
env:
174+
SALT_VERSION: "${{ inputs.salt-version }}"
172175
run: |
173176
tools pkg build deb --relenv-version=${{ inputs.relenv-version }} --python-version=${{ inputs.python-version }} ${{
174177
inputs.source == 'onedir' &&
@@ -288,8 +291,11 @@ jobs:
288291
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
289292
run: |
290293
tools pkg apply-release-patch salt-${{ inputs.salt-version }}.patch --delete
294+
echo "${{ inputs.salt-version }}" > salt/_version.txt
291295
292296
- name: Build RPM
297+
env:
298+
SALT_VERSION: "${{ inputs.salt-version }}"
293299
run: |
294300
tools pkg build rpm --relenv-version=${{ inputs.relenv-version }} --python-version=${{ inputs.python-version }} ${{
295301
inputs.source == 'onedir' &&
@@ -417,6 +423,7 @@ jobs:
417423
418424
- name: Build MacOS Package
419425
env:
426+
SALT_VERSION: "${{ inputs.salt-version }}"
420427
DEV_APP_CERT: "${{ secrets.MAC_SIGN_DEV_APP_CERT }}"
421428
DEV_INSTALL_CERT: "${{ secrets.MAC_SIGN_DEV_INSTALL_CERT }}"
422429
APPLE_ACCT: "${{ secrets.MAC_SIGN_APPLE_ACCT }}"
@@ -550,6 +557,8 @@ jobs:
550557
uses: digicert/ssm-code-signing@v1.2.1
551558

552559
- name: Build Windows Packages
560+
env:
561+
SALT_VERSION: "${{ inputs.salt-version }}"
553562
run: |
554563
tools pkg build windows --relenv-version=${{ inputs.relenv-version }} --python-version=${{ inputs.python-version }} ${{
555564
inputs.source == 'onedir' &&

‎.github/workflows/ci.yml‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -77,26 +77,19 @@ jobs:
7777
- '**'
7878
doc-requirements:
7979
- added|modified: &doc_requirements
80-
- requirements/static/ci/py3.*/docs.txt
80+
- requirements/static/ci/py3.*/docs.lock
8181
lint-requirements:
8282
- added|modified: &lint_requirements
83-
- requirements/static/ci/py3.*/lint.txt
83+
- requirements/static/ci/py3.*/lint.lock
8484
pkg_requirements:
8585
- added|modified: &pkg_requirements
86-
- requirements/static/pkg/py3.*/darwin.txt
87-
- requirements/static/pkg/py3.*/linux.txt
88-
- requirements/static/pkg/py3.*/freebsd.txt
89-
- requirements/static/pkg/py3.*/windows.txt
86+
- requirements/static/pkg/*.in
87+
- requirements/static/pkg/py3.*/*.in
88+
- requirements/static/pkg/py3.*/*.lock
9089
test_requirements:
9190
- added|modified: &test_requirements
92-
- requirements/static/ci/py3.*/darwin.txt
93-
- requirements/static/ci/py3.*/linux.txt
94-
- requirements/static/ci/py3.*/freebsd.txt
95-
- requirements/static/ci/py3.*/windows.txt
96-
- requirements/static/ci/py3.*/darwin-crypto.txt
97-
- requirements/static/ci/py3.*/linux-crypto.txt
98-
- requirements/static/ci/py3.*/freebsd-crypto.txt
99-
- requirements/static/ci/py3.*/windows-crypto.txt
91+
- requirements/static/ci/*.in
92+
- requirements/static/ci/py3.*/*.lock
10093
deleted:
10194
- deleted:
10295
- '**'
@@ -176,7 +169,7 @@ jobs:
176169
shell: bash
177170
run: |
178171
HASH=$(python3 .github/scripts/hash-files.py \
179-
'requirements/**/*.txt' \
172+
'requirements/**/*' \
180173
'cicd/golden-images.json' \
181174
'noxfile.py' \
182175
'pkg/common/env-cleanup-rules.yml' \
@@ -301,15 +294,15 @@ jobs:
301294
shell: bash
302295
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
303296
run: |
304-
tools changelog update-deb --draft
305-
tools changelog update-deb
297+
tools changelog update-deb "${{ needs.prepare-workflow.outputs.salt-version }}" --draft
298+
tools changelog update-deb "${{ needs.prepare-workflow.outputs.salt-version }}"
306299
307300
- name: Update RPM changelog
308301
shell: bash
309302
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
310303
run: |
311-
tools changelog update-rpm --draft
312-
tools changelog update-rpm
304+
tools changelog update-rpm "${{ needs.prepare-workflow.outputs.salt-version }}" --draft
305+
tools changelog update-rpm "${{ needs.prepare-workflow.outputs.salt-version }}"
313306
314307
- name: Create Release Notes Template
315308
shell: bash

0 commit comments

Comments
 (0)