saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
120664 commits 34 branches 292 tags 803 MiB
Commit graph

593 commits

Author SHA1 Message Date
Pedro Algarvio
7f98810ea6
Merge 3006.x into 3007.x 2024-03-28 13:50:44 +00:00
Pedro Algarvio
62f13b32ec Just "grep" what we're after 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2024-03-28 13:41:54 +00:00
Shane Lee
44d23fc4f2 Update to VC Redist 2022 2024-03-27 08:31:00 +00:00
Shane Lee
e525bbada3 Remove vcredist and ucrt from Windows install 2024-03-21 14:54:03 +00:00
Shane Lee
2ab50019a2 Upgrade WIX to 3.14 2024-03-08 21:33:45 +00:00
Shane Lee
5e36621803 Upgrade WIX to 3.14 2024-03-08 21:32:29 +00:00
Pedro Algarvio
bff4741252 Remove salt execution and state modules only when building the windows package 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-19 20:37:29 +00:00
Pedro Algarvio
2425620013
Just "grep" what we're after 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-12 13:03:27 +01:00
Pedro Algarvio
5a89789ba7
Skip nested YAML structures 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-12 13:03:27 +01:00
MKLeb
bee29be6dd
Merge remote-tracking branch 'upstream/3006.x' into mf/master/3006.x 2023-09-08 16:25:39 -04:00
twangboy
2d5584a309 Get default python and relenv versions from CICD 2023-08-31 14:30:32 -07:00
twangboy
91bd8ec154 Don't remove extras dir on uninstall 2023-08-31 14:30:32 -07:00
Pedro Algarvio
26001ed8eb Remove salt execution and state modules only when building the windows package 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-08-02 17:40:00 +00:00
Pedro Algarvio
1decaf5711
Merge 3006.x into master 2023-07-28 11:20:24 +01:00
Daniel A. Wozniak
3877900698 Upgrade relenv to 0.13.2 and Python to 3.10.12. 
Addresses multiple CVEs in dependencies: https://docs.python.org/release/3.10.12/whatsnew/changelog.html#python-3-10-12

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-07-28 06:54:45 +01:00
Pedro Algarvio
c4987f83ed
Merge 3006.x into master 2023-06-28 11:51:20 +01:00
twangboy
e7832f772d Add suggested docs fixes 2023-06-20 19:41:59 +00:00
twangboy
d516d17840 Quote path to salt-bin 2023-06-20 19:41:59 +00:00
twangboy
b0d14780fa Add docs, don't run as service 2023-06-20 19:41:59 +00:00
twangboy
7a802fbb6e Add scripts to installer, clean msi files 2023-06-20 19:41:59 +00:00
Twangboy
2f07a4e3af Fix name of cmd script from master to minion 2023-06-20 19:41:59 +00:00
Twangboy
c016b46029 Remove BOM to fix pre-commit 2023-06-20 19:41:59 +00:00
Twangboy
97e6ff7a1a Add scripts for setting up multi-minion on Windows 2023-06-20 19:41:59 +00:00
Pedro Algarvio
2a65c3e025 Pass along the relenv version that should be used. 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-16 07:32:35 +01:00
Pedro Algarvio
520ec4a0e9 Pass along the relenv version that should be used. 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-14 16:43:53 +01:00
Pedro Algarvio
c10eb79954
Merge 3006.x into master 
Conflicts:
* changelog/64226.fixed.md
* tests/pytests/unit/states/test_pip.py
 2023-05-30 12:59:16 +01:00
MKLeb
8fce8ca476 Relenv now produces Python 3.10.11 2023-05-24 15:13:40 +01:00
MKLeb
ae9f9d379b Fix windows and mac building from without an existing onedir 2023-05-24 15:13:40 +01:00
Pedro Algarvio
dfa273bc5e
Merge 3006.x into master 2023-05-06 08:37:41 +01:00
Twangboy
7e89e3dd9d Include seed in Windows packages 2023-05-02 07:17:15 +01:00
cmcmarrow
13437829fc Merge remote-tracking branch 'upstream/3006.x' into merge-forward/3006.x/master 2023-04-20 17:39:55 -05:00
Twangboy
1e73882cb5 Add back ssm.exe. It is needed for VMtools 2023-04-17 17:57:13 +01:00
Twangboy
dbe5dd564c
Use https for all urls during build 2023-04-06 12:31:17 -06:00
Pedro Algarvio
7160266006
Merge 3006.x into master 2023-04-01 09:41:41 +01:00
Twangboy
11e97b168f Remove some remaining fragments 2023-03-30 20:00:55 +01:00
Twangboy
2418a8504f Use relenv OpenSSL 2023-03-30 20:00:55 +01:00
Pedro Algarvio
73c1289490
Merge 3006.x into master 2023-03-19 18:39:26 +00:00
Twangboy
3127dec7d4 Fix some typos and stupid things I did 2023-03-17 08:29:42 -06:00
Twangboy
15210388f6 Escape quotes in powershell 2023-03-17 08:29:42 -06:00
Twangboy
e6d2e1390c Use registry to detect VC Redist installation 2023-03-15 07:32:42 -06:00
Twangboy
0a707e977a Use registry to detect VC Redist installation 2023-03-14 19:51:01 +00:00
Twangboy
ec8ab6d688 Timestamp files to match git commit 2023-03-10 06:07:06 +00:00
Twangboy
1d6379a759 Add back ssm.exe. It is needed for VMtools 2023-03-09 06:15:16 +00:00
Twangboy
18d444066e Fix issue with errorcode on MSI uninstall 2023-02-28 15:27:46 +00:00
Twangboy
e689b9462d Fix issue with MSI not installing 2023-02-28 15:27:46 +00:00
Twangboy
ebe2e500d7 Fix some formatting in the CS code 2023-02-28 15:27:46 +00:00
Twangboy
50c8639f01 Be more selective about what python processes we are killing 2023-02-28 15:27:46 +00:00
Twangboy
8b0284ab41 Don't kill ALL python processes on MSI uninstall 2023-02-28 15:27:46 +00:00
Twangboy
90659302bc Fix icon issue with NSIS installer 2023-02-28 15:27:46 +00:00
Twangboy
4f6caca155 Build python 3.10.9, fix MSI display 2023-02-28 15:27:46 +00:00