Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[master] Add MAINTAIN (m) privilege to postgres module lookup tables #66963

Closed
wants to merge 308 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
308 commits
Select commit Hold shift + click to select a range
a5a5ca9
Updated version comparsion and to ignore ipc files
dmurphy18 Jun 19, 2024
ceef4ea
Ensure salt master is running before attempting salt api usage
dmurphy18 Jun 24, 2024
c1a5e4e
Revert test for resp status failure
dmurphy18 Jun 25, 2024
c13bcb4
Updated package integration tests
dmurphy18 Jun 25, 2024
1e4509f
Updated package integration tests
dmurphy18 Jun 26, 2024
0d1d9a1
Updated test to run on Linux only
dmurphy18 Jun 26, 2024
5b6ea8b
Added back skip unless on Darmin pytest marker for symbolic tests
dmurphy18 Jun 26, 2024
a04ae03
Fix typo
dmurphy18 Jun 27, 2024
aef7697
Adjust downgrade tests to allow for psutil, similar to upgrade test
dmurphy18 Jul 9, 2024
0681720
Adjust testing support for pkg, and downgrading
dmurphy18 Jul 9, 2024
e29a663
Debugging downgrade failures
dmurphy18 Jul 9, 2024
baa296a
More debugging of downgrade
dmurphy18 Jul 10, 2024
0707440
Debugging Debian, Ubuntu downgrade failure
dmurphy18 Jul 10, 2024
bf1d23c
Debugging
dmurphy18 Jul 10, 2024
dd1309c
Exclude Debian & Ubuntu downgrade testing till fixes from PR 66218
dmurphy18 Jul 11, 2024
37a1c80
Updated test skip to include all OS's
dmurphy18 Jul 12, 2024
98d7acd
Removed DGM comment and adjusted skip for downgrade
dmurphy18 Jul 12, 2024
830a69e
Update to use 'darwin' for MacOS
dmurphy18 Jul 12, 2024
0defb98
Added test to catch Falsey value output issue in cmd.script
Akm0d Jul 16, 2024
519d93f
Update docs for cmd.script to account for falsey script values
Akm0d Jul 16, 2024
77b7c23
Remove changes to test_cmdmod.py
Akm0d Jul 16, 2024
4e707af
Fix relative file_roots paths
hurzhurz Jul 4, 2024
2595d8e
Fix nsis installer/uninstaller to close when it's finished
twangboy Jul 11, 2024
64ef4b1
Add simple workflow for Windows Installer Tests
twangboy Jul 12, 2024
853f144
Tie windows installer action into ci.yml
twangboy Jul 16, 2024
b8a2e80
Add regression test for CVE-2024-37088
dwoz Jul 12, 2024
a504c4c
RemotePillar raises an exception on bad data
dwoz Jul 12, 2024
4a2733a
Add changelog for #66702
dwoz Jul 12, 2024
610cdaa
Test fix
dwoz Jul 17, 2024
d7446d9
Add test for issues #66514 and #53538
lkubb May 14, 2024
14edbcf
Fix parallel state execution with Salt-SSH
lkubb May 14, 2024
15112db
Fix new linter errors that poped up on nightlys
dwoz Jul 18, 2024
76ae4a6
Make sure the root minion process handles SIGUSR1
max-arnold Feb 19, 2024
84b4e96
Add integration test
max-arnold Feb 20, 2024
176bd3a
Update certifi in answer to dependabot
dwoz Jul 18, 2024
0fcde71
Fixes cmd.run with requisites on Windows
twangboy Jul 17, 2024
68d18b2
Fix win_dsc tests
twangboy Jul 22, 2024
137a6b7
Revert windows installer check change
dwoz Jul 23, 2024
22f3d26
Test check_version fix
dwoz Jul 23, 2024
962f752
Accept 2 as a valid exitcode for the nsis installer
twangboy Jul 23, 2024
f39b799
Revert "Test check_version fix"
dwoz Jul 24, 2024
8f4565c
Use artifact version for compare_versions test
dwoz Jul 24, 2024
6b0690e
Remove debug output from shell scripts for packaging
dmurphy18 Jul 25, 2024
1b66ffc
Replace use of pygit2 deprecated and removed (1.15.0) oid with id
dmurphy18 Jul 24, 2024
c25c8d5
Updated comment
dmurphy18 Jul 24, 2024
a2b8505
Make sure installer/uninstaller isn't running
twangboy Jul 26, 2024
e1d3c74
Skip pkg download test on Windows... for now
twangboy Jul 26, 2024
ef2a5a1
Fix windows pymssql requirement
dwoz Jul 29, 2024
3b10d47
Fix windows requirments pre-commit
dwoz Jul 29, 2024
b40833e
Release v3006.9
saltbot-open Jul 29, 2024
002ab91
Method name is _decode_payload not _decode_messages
dwoz Aug 7, 2024
05528e2
Add changelog for #66789
dwoz Aug 7, 2024
8b33b7f
Merge pull request #66790 from dwoz/issue/3006.x/66789
dmurphy18 Aug 8, 2024
53ddf5a
The profile outputter does not crash with incorrectly formatted data
Akm0d Jul 31, 2024
c222b6e
Remove epub generation for docs
ScriptAutomate Jul 30, 2024
6774e08
Remove psutil_compat.py file, which should have been removed when RHE…
dmurphy18 Jul 30, 2024
101042d
Remove psutil_compat.py file, which should have been removed when RHE…
dmurphy18 Jul 30, 2024
8c33bd5
Corrected typo in 'Sudium' to 'Sodium' and pre-commit updated rest of…
dmurphy18 Jul 30, 2024
3cea3ef
Doubled timeout to 120 for downgrade test
dmurphy18 Aug 1, 2024
6f0e014
Debug outputs for downgrade
dmurphy18 Aug 1, 2024
715e150
Added debugging information to pkg support
dmurphy18 Aug 2, 2024
dab09a4
Adjusted debugging
dmurphy18 Aug 2, 2024
c7fa80c
Added more debugging
dmurphy18 Aug 5, 2024
72a65ff
Refined restart_services
dmurphy18 Aug 5, 2024
759b167
Comment out debugging print statements in support pkg.py
dmurphy18 Aug 5, 2024
61a3053
Fix typo
dmurphy18 Aug 5, 2024
1c1633a
Refine debugging and skip on part test for MacOS
dmurphy18 Aug 5, 2024
fb5afea
Working fix, and clean up debug statements
dmurphy18 Aug 6, 2024
496bb08
Revert bad spelling for release name, was part of test
dmurphy18 Aug 6, 2024
4e41a00
Allow for arm64 or x86_64 when testing MacOS
dmurphy18 Aug 7, 2024
b3f2325
Added debugging statements
dmurphy18 Aug 7, 2024
ce881d5
more debugging and added is_arm64 to utils platform
dmurphy18 Aug 7, 2024
e97ae27
further debug
dmurphy18 Aug 8, 2024
34e0120
Fix debugging
dmurphy18 Aug 8, 2024
6e43c93
Use updated pytest-skip-markers to pick up corrected MacOS Arm64 support
dmurphy18 Aug 9, 2024
afbb42e
Call close method on finished processes
dwoz Aug 5, 2024
2b2c038
Add changelog for #66726
dwoz Aug 5, 2024
bcb0d79
Wait longer for the test process to finish
dwoz Aug 7, 2024
092a79c
Do not rely on is_alive
dwoz Aug 7, 2024
852bf00
Ensure Manjaro ARM reports the correct os_family of Arch.
garethgreenaway Aug 9, 2024
3e8fb1a
salt.utils.atomicfile: respect system umask when creating new files
terminalmage Aug 7, 2024
46ef29b
Add test case
terminalmage Aug 7, 2024
17dcfa2
Add changelog file
terminalmage Aug 7, 2024
6d10c20
Fix batch mode hang indefinitely in some scenarios - unit tests to fo…
dmurphy18 Jul 29, 2024
3d7ebf0
Removing tech debt and restoring original pytest.skip for tests
dmurphy18 Aug 14, 2024
f3a7083
Adjusted tests for classic or relenv, as everything is relenv now
dmurphy18 Aug 14, 2024
cbcaf9f
Limit test to Linux which use systemctl
dmurphy18 Aug 14, 2024
3cd7a62
Revised test due to reviewer comments
dmurphy18 Aug 15, 2024
0d78611
Fix win_wua to handle empty CDispatch objects
twangboy Jul 23, 2024
671cdd9
Migrate grains tests to pytest
dwoz Aug 8, 2024
e987ff4
Fix status.master to detect master properly
twangboy Jul 23, 2024
411c1f3
Fix master pull socket permissions
dwoz Aug 13, 2024
0466043
Add regression test for master_event_pub.ipc permissions
dwoz Aug 13, 2024
9ec04e0
Add docstring to ipc_publish_server
dwoz Aug 14, 2024
9a6f5e8
Add transport layer ipc socket perms test
dwoz Aug 14, 2024
3f9f029
Add changelog for #66228
dwoz Aug 14, 2024
61d6279
more transport ipc socket permissions tests
dwoz Aug 14, 2024
d75030c
Fix test name check
dwoz Aug 14, 2024
63958cf
Test to check all transport ipc perms
dwoz Aug 14, 2024
29ffc3a
Skip pkg tests that need new golden image
dwoz Aug 16, 2024
4e8fe71
Skip pkg tests that need new golden image
dwoz Aug 16, 2024
a763096
Merge pull request #66817 from dwoz/testskip
dwoz Aug 20, 2024
650f608
Adjust timeout from 2 to 3 hours for MacOS package tests
dmurphy18 Aug 20, 2024
c9603c2
Bump to get rebuild
dmurphy18 Aug 21, 2024
3fea06f
MacOS Test time limit is now 2 & 1/2 hours
dmurphy18 Aug 21, 2024
3ae69b9
Option no_spaces to remove spaces in separator
MurzNN Apr 25, 2021
7faee48
Add an option to ini.set_option
twangboy Aug 21, 2024
fb031ac
Add warning to docs
twangboy Aug 21, 2024
d0d8206
Add encoding and no_spaces options to state
twangboy Aug 21, 2024
2536ff6
Allow builds to proceed without coverage file
dwoz Aug 23, 2024
8dd2e34
Merge branch '3006.x' into merge/3007.x/3006.x
dwoz Aug 27, 2024
80302f0
Update old Slack Community links with Discord links
dmurphy18 Aug 27, 2024
1eb4ec7
Updated with correct Discord invite link, and correct badge link
dmurphy18 Aug 27, 2024
137ccc4
Merge pull request #66850 from dmurphy18/fix_community_slack_link
dmurphy18 Aug 27, 2024
43c825f
No more salt.ext.tornado
dwoz Aug 28, 2024
ed7496e
Replace Slack with Discord
max-arnold Jul 31, 2024
a10a2f1
Merge pull request #66769 from max-arnold/slack-discord
dmurphy18 Aug 29, 2024
4d2ad41
Debugging
dmurphy18 Aug 12, 2024
d3ad252
Updated salt-syndic to utilize user/group for Salt (master settings),…
dmurphy18 Aug 14, 2024
5298d33
Update tests
dmurphy18 Aug 14, 2024
e097b54
Testing with master_opts user for syndic_user
dmurphy18 Aug 19, 2024
853d3da
Added delay for salt_master running, and updated some package tests
dmurphy18 Aug 20, 2024
6874ff5
Revert syndic from master opts to check test failures
dmurphy18 Aug 21, 2024
b0e1dfd
Revert logrotation test to RedHat family only
dmurphy18 Aug 21, 2024
2c8beca
Adjust tests for syndic
dmurphy18 Aug 23, 2024
fbd6b74
Further debug tests
dmurphy18 Aug 23, 2024
7be41f5
Updated tests, and debugging
dmurphy18 Aug 26, 2024
4ee0f94
Rearrangment of test parameters
dmurphy18 Aug 27, 2024
770def9
Ensure salt_master is left running after test stopped it
dmurphy18 Aug 28, 2024
ba558de
Altered debugging
dmurphy18 Aug 29, 2024
067ee3c
Further debugging
dmurphy18 Sep 3, 2024
2bd4e00
Fix typo
dmurphy18 Sep 4, 2024
eada163
Commented out debugging print statements
dmurphy18 Sep 4, 2024
1ebd3c6
Forced rebuild
dmurphy18 Sep 6, 2024
a7da90d
Removed commented out debug print statements
dmurphy18 Sep 6, 2024
c738a2f
Move installer tests to workflow
twangboy Sep 4, 2024
fb2297e
Update workflows
twangboy Sep 4, 2024
676945e
Only run tests when nsis files are modified
twangboy Sep 4, 2024
8b16003
Fix parsing of IPv4 mapped IPv6 addresses
twangboy Aug 26, 2024
cae94bc
Make all network unit tests run on Windows
twangboy Aug 28, 2024
63b9da8
Fix pkg.removed with multiple versions on Windows
twangboy Aug 15, 2024
de33a40
Fix test_win_pkg with real winrepo location
twangboy Aug 21, 2024
7437fe9
Gate passing version for Windows
twangboy Aug 27, 2024
d3c0f99
Revert gating for Windows, use sys instead of salt.utils.platform
twangboy Aug 29, 2024
36c6539
Add some SSH settings to fix the SSH Broken Pipe with Amazon Linux
twangboy Aug 30, 2024
72bb50c
Revert SSH settings
twangboy Sep 4, 2024
f0e2cf4
Remove salt.utils.data from fileserver
twangboy Aug 26, 2024
5018743
Add changelog for 66835
twangboy Aug 28, 2024
f9c9787
Fix pre-commit
twangboy Aug 29, 2024
f2be0b7
Fix windows package builds
twangboy Sep 13, 2024
468b26e
initial work on log once option
dwoz Aug 18, 2024
df47c09
Fix linter errors
dwoz Sep 13, 2024
2e514c5
Fix zeromq transport unit tests
dwoz Sep 13, 2024
a9b37c2
Account for changes in transport api in tests
dwoz Sep 14, 2024
3140aec
Add more loader dunders to cp module.
dwoz Dec 6, 2023
96c59e0
Add tests for opts dunder
dwoz Dec 7, 2023
fc06de8
Try importing opts dunder
dwoz Dec 7, 2023
b36f276
Better handling of loader returns
dwoz Dec 8, 2023
96bc89f
Fix broken tests
dwoz Dec 8, 2023
5ee6d3c
Fix another test using __opts__
dwoz Dec 9, 2023
d4ee873
Fix windows pkg tests
dwoz Dec 10, 2023
0897afc
Retrun opts because they get modified often
dwoz Sep 12, 2024
0dc964f
Clean up imports
dwoz Sep 13, 2024
4925172
Mark 3007 as released
dwoz Sep 16, 2024
561a5c4
Handle cases where the process is gone or zombified
dwoz Sep 17, 2024
a71bcfb
Do not install when no-install is passed
dwoz Sep 17, 2024
77260ac
Drop Arch Linux; update latest golden images
ScriptAutomate Sep 13, 2024
c54a8ce
Test on systems where 7zip exists
twangboy Sep 16, 2024
26e31d2
Manage symlinks after dirs and files
twangboy Aug 28, 2024
572e955
Add tests and changelog
twangboy Aug 30, 2024
bbb0013
Make sure symlinks are done last
twangboy Sep 6, 2024
294a81a
Try to handle similar names
twangboy Sep 11, 2024
554da0c
Compare full paths
twangboy Sep 12, 2024
a5c3c18
Fix unit test on Linux
twangboy Sep 12, 2024
99639ca
Update contributing guide and PR template
twangboy Sep 17, 2024
6c38c1a
Fix test_system flaky setup_teardown fn
m-czernek Aug 30, 2024
eba0b17
Add test cases for stdin_raw_newlines functionality
niklasr22 Aug 26, 2024
9da6764
Convert stdin string to bytes regardless of stdin_raw_newlines
niklasr22 Aug 26, 2024
df835c1
Add test for issue #66610
lkubb Jun 3, 2024
af3818b
Fix Salt-SSH crash when key deploy is skipped manually
lkubb Jun 3, 2024
73bb35d
Correct bash-completion for Debian / Ubuntu
dmurphy18 Aug 27, 2024
2532a08
Added changelog for fix
dmurphy18 Aug 27, 2024
02c196a
Add symbolic links for bash-completion
dmurphy18 Aug 28, 2024
fd90018
Corrected files for zsh and salt-proxy
dmurphy18 Aug 28, 2024
9c712e0
Correct symbolic link generation to corrspond with Debina/Ubuntu fork…
dmurphy18 Aug 29, 2024
4be1685
Testing building with bash-completion and systemd
dmurphy18 Sep 3, 2024
974bad0
Updated debian rules to not include python3
dmurphy18 Sep 4, 2024
142b7ac
Restore systemd handling in preinst and postinst for Debina/Ubuntu
dmurphy18 Sep 4, 2024
0483e44
Updated symbolic links for bash completion as per original issuer com…
dmurphy18 Sep 12, 2024
94fdf08
Adjust salt-common.install for bash-completion
dmurphy18 Sep 17, 2024
c5b5732
Use the same args for integration tests
dwoz Sep 19, 2024
c1dd74a
docs(modules/system): fix `system.get_computer_name` CLI example
myii Aug 26, 2024
17f9ff5
Merge pull request #66842 from dwoz/merge/3007.x/3006.x
dwoz Sep 19, 2024
ae1d3f3
Merge pull request #66857 from twangboy/fix_64630
dwoz Sep 19, 2024
6c3365f
Move grain_opts to subdict to prevent overwriting core grains
terminalmage Aug 7, 2024
d4b2957
Add changelog file
terminalmage Aug 7, 2024
748943c
Corrected the description of the two parameters mkey and key in the M…
sunxingboo Aug 9, 2024
698979f
fix nacl.keygen for not yet existing sk_file or pk_file
hurzhurz Aug 1, 2024
059d1e0
Testing previous version 4.3.6 instead of latest 4.4.0 for action/upl…
dmurphy18 Sep 6, 2024
9cef9a6
Revert to using v4 and alter pattern (leave off dash)
dmurphy18 Sep 9, 2024
3827456
removing commented out 4.3.6, and added debugging
dmurphy18 Sep 10, 2024
d77a0d5
Trying including hidden files for coverage on Linux - Test
dmurphy18 Sep 10, 2024
ac09c43
Trying other debug methods
dmurphy18 Sep 11, 2024
58083b7
Debugging
dmurphy18 Sep 12, 2024
51cc9b8
change to force build, since github stalled it overnight
dmurphy18 Sep 13, 2024
51099d9
Correct logic error - removed 'needs'
dmurphy18 Sep 13, 2024
6e0fc16
Update Windows and MacOS actions for Download Code Coverage Test Run …
dmurphy18 Sep 16, 2024
a6fff58
Remove comments
dmurphy18 Sep 16, 2024
2db4de4
Solve the lack of combined coverage reports
dmurphy18 Sep 19, 2024
393dad1
Removed commented out name
dmurphy18 Sep 20, 2024
b912817
Fixes cmd.run with requirements on Windows
twangboy Jul 17, 2024
bf580e6
Make tests compatible with venv bundle
m-czernek Jul 8, 2024
db31e2b
Fix test_transactional_update tests
m-czernek Jul 10, 2024
29d4137
We depend on msgpack < 1.0.0
m-czernek Jul 17, 2024
0675d1f
Remove passlib assumption from pycrypto tests
m-czernek Jul 17, 2024
101a773
Fix pre-commit
twangboy Jul 19, 2024
c0354fc
Ensure venv usage
m-czernek Jul 22, 2024
7a87137
Reverts changes to test_transactional_update
m-czernek Jul 22, 2024
9922b1a
Fix yamllint tests
m-czernek Jul 26, 2024
caf62f9
fix yaml output
Aug 7, 2024
a9c9aa2
doc: fix jinja.import_json module docstr
blu-base Aug 31, 2024
6b3418f
Merge remote-tracking branch 'saltstack/3006.x' into merge/3007.x/3006.x
dwoz Sep 20, 2024
818dd9f
Fix yamldumper test
dwoz Sep 22, 2024
b6e3f9b
Fix test on platforms that do not have cdumper
dwoz Sep 23, 2024
c384489
Merge remote-tracking branch 'saltstack/3006.x' into merge/3007.x/3006.x
dwoz Sep 23, 2024
0007447
Merge pull request #66910 from dwoz/merge/3007.x/3006.x
dwoz Sep 23, 2024
be33bf6
Removed notifying Slack since Slack no longer used.
dmurphy18 Sep 23, 2024
d11775e
Upgrade relenv to 0.17.2
dwoz Sep 20, 2024
64690a9
Fix error in test suite teardown
dwoz Sep 22, 2024
f5c332b
Attempt to resolve test artifact flakiness
dwoz Sep 24, 2024
8db71dd
Revert "Attempt to resolve test artifact flakiness"
dwoz Sep 24, 2024
47e412c
Better handling output of systemctl --version
vzhestkov Aug 28, 2024
6976c17
Add more cases to test grains.core._systemd
vzhestkov Aug 28, 2024
ee4d532
Add 66856 changelog entry
vzhestkov Aug 30, 2024
19dfa41
Merge remote-tracking branch 'saltstack/3006.x' into merge/3007.x/3006.x
dwoz Sep 26, 2024
e4aa82f
Update master-cluster.rst Example Config
kevin-andrew-wipro Aug 21, 2024
ff12c7f
Fix merge wart
dwoz Sep 26, 2024
ef3d8f7
Merge pull request #66930 from dwoz/merge/3007.x/3006.x
dwoz Sep 30, 2024
44d9600
Do no allow duplicate message ids
dwoz Aug 7, 2024
47e4c80
Add test for issue #66600
lkubb May 30, 2024
0c8cb68
Fix accessing wrappers in Jinja templates via attributes
lkubb May 30, 2024
3bcb67f
Add tests for issues #66376 and #41794
lkubb May 30, 2024
096dca6
Make SSH FunctionWrapper behave more like LazyLoader
lkubb May 31, 2024
c2e0b57
Document that dict key syntax should be preferred
lkubb May 31, 2024
6463994
Use grains dict directly when not traversing subdict
lkubb Jun 24, 2024
7f73274
The zmq socket poll method needs to be awaited
dwoz Sep 26, 2024
071325c
Add changelog for issue #65265
dwoz Sep 26, 2024
23b2f65
More reliable test shutdown
dwoz Sep 26, 2024
cefd20b
add 'm = MAINTAIN' privilege to the maps in the postgres module
jdelic Oct 11, 2024
d50c3df
add changelog entry for bugfix to #66962
jdelic Oct 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
blank_issues_enabled: true
contact_links:
- name: Salt Community Slack
url: https://saltstackcommunity.slack.com/
- name: Salt Community Discord
url: https://discord.com/invite/J7b7EscrAs
about: Please ask and answer questions here.
- name: Salt-Users Forum
url: https://groups.google.com/forum/#!forum/salt-users
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/tech-debt.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ assignees: ''
---

### Description of the tech debt to be addressed, include links and screenshots
<!-- Note: Please direct questions to the salt-users google group, IRC or Community Slack. -->
<!-- Note: Please direct questions to the salt-users google group, IRC or Community Discord. -->

### Versions Report
(Provided by running `salt --versions-report`. Please also mention any differences in master/minion versions.)
16 changes: 12 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,23 @@ Remove this section if not relevant

### Merge requirements satisfied?
**[NOTICE] Bug fixes or features added to Salt require tests.**
<!-- Please review the [test documentation](https://docs.saltproject.io/en/master/topics/tutorials/writing_tests.html) for details on how to implement tests into Salt's test suite. -->
<!-- Please review the test documentation for details on how to implement tests
into Salt's test suite:
https://docs.saltproject.io/en/master/topics/tutorials/writing_tests.html -->
- [ ] Docs
- [ ] Changelog - https://docs.saltproject.io/en/master/topics/development/changelog.html
- [ ] Tests written/updated

### Commits signed with GPG?
Yes/No

Please review [Salt's Contributing Guide](https://docs.saltproject.io/en/master/topics/development/contributing.html) for best practices, including the
[PR Guidelines](https://docs.saltproject.io/en/master/topics/development/pull_requests.html).
<!-- Please review Salt's Contributing Guide for best practices and guidance in
choosing the right branch:
https://docs.saltproject.io/en/master/topics/development/contributing.html -->

See GitHub's [page on GPG signing](https://help.github.com/articles/signing-commits-using-gpg/) for more information about signing commits with GPG.
<!-- Additional guidance for pull requests can be found here:
https://docs.saltproject.io/en/master/topics/development/pull_requests.html -->

<!-- See GitHub's page on GPG signing for more information about signing commits
with GPG:
https://help.github.com/articles/signing-commits-using-gpg/ -->
4 changes: 2 additions & 2 deletions .github/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ newIssueWelcomeComment: >

- [Community Wiki](https://github.com/saltstack/community/wiki)
- [Salt’s Contributor Guide](https://docs.saltproject.io/en/master/topics/development/contributing.html)
- [Join our Community Slack](https://via.vmw.com/salt-slack)
- [Join our Community Discord](https://discord.com/invite/J7b7EscrAs)
- [IRC on LiberaChat](https://web.libera.chat/#salt)
- [Salt Project YouTube channel](https://www.youtube.com/channel/UCpveTIucFx9ljGelW63-BWg)
- [Salt Project Twitch channel](https://www.twitch.tv/saltprojectoss)
Expand All @@ -39,7 +39,7 @@ newPRWelcomeComment: >

- [Community Wiki](https://github.com/saltstack/community/wiki)
- [Salt’s Contributor Guide](https://docs.saltproject.io/en/master/topics/development/contributing.html)
- [Join our Community Slack](https://via.vmw.com/salt-slack)
- [Join our Community Discord](https://discord.com/invite/J7b7EscrAs)
- [IRC on LiberaChat](https://web.libera.chat/#salt)
- [Salt Project YouTube channel](https://www.youtube.com/channel/UCpveTIucFx9ljGelW63-BWg)
- [Salt Project Twitch channel](https://www.twitch.tv/saltprojectoss)
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ jobs:
github.event.pull_request.merged == true
&& (
contains(github.event.pull_request.labels.*.name, 'backport:master') ||
contains(github.event.pull_request.labels.*.name, 'backport:3007.x') ||
contains(github.event.pull_request.labels.*.name, 'backport:3006.x') ||
contains(github.event.pull_request.labels.*.name, 'backport:3005.x')
)
&& (
(github.event.action == 'labeled' && (
contains(github.event.pull_request.labels.*.name, 'backport:master') ||
contains(github.event.pull_request.labels.*.name, 'backport:3007.x') ||
contains(github.event.pull_request.labels.*.name, 'backport:3006.x') ||
contains(github.event.pull_request.labels.*.name, 'backport:3005.x')
))
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ jobs:
- linkcheck
- spellcheck
- html
- epub
# - pdf

steps:
Expand Down
46 changes: 18 additions & 28 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,9 @@ jobs:
- pkg/**
- *pkg_requirements
- *salt_added_modified
nsis_tests:
- added|modified: &nsis_tests
- pkg/windows/nsis/**
testrun:
- added|modified:
- *pkg_requirements
Expand Down Expand Up @@ -260,6 +263,14 @@ jobs:
- prepare-workflow
with:
changed-files: ${{ needs.prepare-workflow.outputs.changed-files }}
nsis-tests:
name: NSIS Tests
if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
uses: ./.github/workflows/nsis-tests.yml
needs:
- prepare-workflow
with:
changed-files: ${{ needs.prepare-workflow.outputs.changed-files }}

prepare-release:
name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}"
Expand Down Expand Up @@ -437,7 +448,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
relenv-version: "0.17.0"
relenv-version: "0.17.2"
python-version: "3.10.14"

build-salt-onedir:
Expand All @@ -453,7 +464,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
relenv-version: "0.17.0"
relenv-version: "0.17.2"
python-version: "3.10.14"

build-pkgs-onedir:
Expand All @@ -466,7 +477,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.17.0"
relenv-version: "0.17.2"
python-version: "3.10.14"
source: "onedir"

Expand All @@ -480,7 +491,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.17.0"
relenv-version: "0.17.2"
python-version: "3.10.14"
source: "src"
build-ci-deps:
Expand Down Expand Up @@ -1537,27 +1548,6 @@ jobs:
workflow-slug: ci
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}

archlinux-lts:
name: Arch Linux LTS Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
needs:
- prepare-workflow
- build-ci-deps
uses: ./.github/workflows/test-action-linux.yml
with:
distro-slug: archlinux-lts
nox-session: ci-test-onedir
platform: linux
arch: x86_64
nox-version: 2022.8.7
gh-actions-python-version: "3.10"
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
workflow-slug: ci
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}

debian-11:
name: Debian 11 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'debian-11') }}
Expand Down Expand Up @@ -2005,7 +1995,6 @@ jobs:
- amazonlinux-2-arm64
- amazonlinux-2023
- amazonlinux-2023-arm64
- archlinux-lts
- debian-11
- debian-11-arm64
- debian-12
Expand Down Expand Up @@ -2059,8 +2048,9 @@ jobs:
id: get-coverage-reports
uses: actions/download-artifact@v4
with:
name: all-testrun-coverage-artifacts
path: artifacts/coverage/
pattern: all-testrun-coverage-artifacts*
merge-multiple: true

- name: Display structure of downloaded files
run: tree -a artifacts/
Expand Down Expand Up @@ -2152,6 +2142,7 @@ jobs:
- prepare-workflow
- pre-commit
- lint
- nsis-tests
- build-docs
- build-deps-onedir
- build-salt-onedir
Expand All @@ -2172,7 +2163,6 @@ jobs:
- amazonlinux-2-arm64
- amazonlinux-2023
- amazonlinux-2023-arm64
- archlinux-lts
- debian-11
- debian-11-arm64
- debian-12
Expand Down
Loading
Loading