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 2
117764 commits 34 branches 292 tags 803 MiB
Commit graph

569 commits

Author SHA1 Message Date
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
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
Twangboy
65f84e34d5 Find MSI install for removal 2023-02-28 15:27:46 +00:00
Twangboy
1d6558afde Don't get path from registry until we fix proc.run 2023-02-28 15:27:46 +00:00
Twangboy
a2552e63dd Set EstimatedSize on creation 2023-02-28 15:27:46 +00:00
Pedro Algarvio
8b543dd204 Fix windows install scripts 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-02-20 19:40:47 +00:00
Pedro Algarvio
6c819439b5 Add a few more nice to have hooks 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-02-07 07:10:13 +00:00
Twangboy
b60b1451f5 Add pythonw.exe back to the package 2023-01-30 07:25:39 -07:00
Pedro Algarvio
fd1f777c29 Address review comments and add help text to the added powershell script flags 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-01-25 10:05:16 -07:00
Pedro Algarvio
39c4aedc97 Build the Windows packages with the previously built relenv onedir 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-01-25 10:05:16 -07:00
Twangboy
e932b5ab34 Fix prep_salt.cmd 2023-01-25 10:05:16 -07:00
Twangboy
841ca5da91 Clean up onedir archives 2023-01-25 10:05:16 -07:00
Twangboy
38e6857b06 Don't call package build script with powershell 2023-01-25 10:05:16 -07:00
Twangboy
457789e744 Un revert the CICD option 2023-01-25 10:05:16 -07:00
Twangboy
0010d44d27 Revert the CICD switch thing 2023-01-25 10:05:16 -07:00
Twangboy
30fa9888e2 Don't right justify success/failure in CICD 2023-01-25 10:05:16 -07:00
Twangboy
ea80b1586d Refresh environment for MSI (wix) 2023-01-25 10:05:16 -07:00
Twangboy
7e90ce0271 Remove unneded pythonwin dirs and tests 2023-01-06 22:26:17 +00:00
Twangboy
f684b50348
Missed the manual tests... 2023-01-04 17:45:29 -07:00
Twangboy
dc0e0591e4
Fix pre-commit 2023-01-04 17:45:29 -07:00
Twangboy
19c8910ef2
Fix NSIS Installer tests 2023-01-04 17:45:25 -07:00
Twangboy
69f84e604a
Remove blank line from .gitignore 2023-01-04 08:42:27 -07:00
Twangboy
13bd49ac5d
Fix MSI Tests 2023-01-04 08:41:48 -07:00
Twangboy
76731ff26f
Add MSI Support 2023-01-04 08:41:43 -07:00
Twangboy
bdfcb806c6 Remove libsodium libraries from install 2022-12-23 10:25:16 +00:00
Twangboy
9fb07b888b Update license to 2023 2022-12-20 07:12:39 -07:00