Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
b43018d
systemd_service: remove caching of 'systemctl status' to fix automati…
hurzhurz Dec 20, 2024
32b55b9
add test for automatic daemon-reload in systemd_service module
hurzhurz Jan 31, 2025
3194208
Remove dead code.
dwoz Mar 8, 2025
7bcac75
Handle integer usernames properly
twangboy Mar 7, 2025
c72f6c7
Remove unnecessary function from test
twangboy Mar 7, 2025
22eb828
Remove unused imports
twangboy Mar 7, 2025
b6d532c
Use f-string instead of str()
twangboy Mar 10, 2025
0b17433
Merge pull request #67800 from twangboy/fix_59344
dwoz Mar 10, 2025
3525934
Updating version_cmp for rpm
dmurphy18 Mar 7, 2025
803ed79
Updating version comparison for rpm and removed obsolete comparison m…
dmurphy18 Mar 10, 2025
60ce663
Updated tests for removed obsolete rpm version comparsion functions
dmurphy18 Mar 10, 2025
57bf2b9
Removed debug statements
dmurphy18 Mar 10, 2025
92959b9
Ensure salt-cloud has salt-master dependency on Debian and Ubuntu
dmurphy18 Mar 12, 2025
73124e2
Add tests for issue #67031
lkubb Nov 4, 2024
892a309
Constrain the localfs cache to the cachedir
lkubb Nov 4, 2024
17231f5
Fix pre-commit
lkubb Nov 7, 2024
7423636
Fix unittests
lkubb Feb 20, 2025
b5e850e
Fix find_json to not rely on newline after valid JSON
m-czernek Oct 31, 2024
f99b663
Fix JSON.find_json code style nits
m-czernek Nov 25, 2024
edd7bec
Do not install when no-install is passed
dwoz Mar 8, 2025
3150593
Actually run upgrade tests
dwoz Mar 8, 2025
2d521d7
Actually run upgrade
dwoz Mar 9, 2025
ca60ebc
Fix bin_file on windows
dwoz Mar 9, 2025
f9f3f83
Enable WMIC on the runner
twangboy Mar 12, 2025
ae92460
Add get capabilties
dwoz Mar 12, 2025
56e8425
Try to get wmic back
dwoz Mar 12, 2025
505b234
Windows upgrade test fix-ups
dwoz Mar 13, 2025
e2776ee
Do not clean master key on windows
dwoz Mar 13, 2025
41e069d
Conf dir is string not tuple
dwoz Mar 14, 2025
4c68d85
Run windows downgrade tests
dwoz Mar 16, 2025
10fb7d4
Add comment to help explain what is expected
dwoz Mar 16, 2025
4fbae13
Move output password removal after functional text matching
m-czernek Feb 20, 2025
e74e5ac
Add tests for passwd shell sanitization
m-czernek Mar 18, 2025
f7c0274
Raise timeout error on timeout
dwoz Mar 18, 2025
d9934fc
Downgrade must uninstall the newer msi
dwoz Mar 18, 2025
07f5429
Do not try to uninstall unless downgrading
dwoz Mar 19, 2025
d634d8b
Add release patch to draft release
dwoz Mar 18, 2025
c42bb0d
Publish draft after pypi and tag
dwoz Mar 18, 2025
add6e60
Fix testrun log artifact name
dwoz Mar 18, 2025
e38e9d1
Remove dead code
dwoz Mar 18, 2025
d29e77c
Clean up release workflow
dwoz Mar 18, 2025
e4d8ab8
Bump actionlint version
dwoz Mar 18, 2025
5e73cd2
Cleanup actionlint results
dwoz Mar 18, 2025
e32526f
skip pypi publish for now
dwoz Mar 18, 2025
7440703
Add pr write premission
dwoz Mar 18, 2025
7e1f48d
Fix action lint
dwoz Mar 18, 2025
bb6479d
Bump action version
dwoz Mar 18, 2025
6cc8723
Always set matrix even when it will be empty
dwoz Mar 18, 2025
127e2ca
Fix prepare worklow runner name
dwoz Mar 19, 2025
b0013cb
Ignore draft release
dwoz Mar 19, 2025
564b7e9
No more staged release
dwoz Mar 19, 2025
dcf20b0
No more s3 cache
dwoz Mar 19, 2025
281c4da
Do not change release name template
dwoz Mar 19, 2025
12af0fd
Install python 3.10 where needed
dwoz Mar 19, 2025
07f8a51
Comment out what we know works
dwoz Mar 19, 2025
dfa9e00
Download release patch
dwoz Mar 19, 2025
6feb0c2
Fix release patch path
dwoz Mar 19, 2025
cd62b3a
Re-enable last release bits
dwoz Mar 19, 2025
21e99f6
Release v3006.10
saltbot-open Mar 19, 2025
4d48999
Merge branch '3006.x' into merge/3007.x/3006.x
dwoz Mar 19, 2025
23589d0
fix merge wart
dwoz Mar 19, 2025
3923a58
Allow for 0 noc
dwoz Mar 23, 2025
c192b11
Fail when failures happen
dwoz Mar 24, 2025
3b988af
WIP - fix deb tests
dwoz Mar 25, 2025
97c2219
Remove no-uninstall from second pkg test run
dwoz Apr 3, 2025
ff2714f
Speed upgrade test up a bit
dwoz Apr 3, 2025
fad864e
Skip problematic test
dwoz Apr 3, 2025
f8349ca
Skip tests that will not pass
dwoz Apr 3, 2025
a7a09be
Fix typo
twangboy Apr 7, 2025
cce8728
Fix failing unit test
twangboy Apr 8, 2025
ec3178f
Add wheel constraint
dwoz Apr 8, 2025
799a2cf
Fix pre-commit
dwoz Apr 9, 2025
d813450
Merge forward 3006.x to 3007.x
dwoz Apr 9, 2025
8c0eeff
Update wheel and setuptools versions
dwoz Apr 9, 2025
98db47f
Upgrade setuptools deps
dwoz Apr 10, 2025
5eaf866
Pull in newer jaraco for setuptools
dwoz Apr 10, 2025
faeae02
Update relenv version
dwoz Apr 14, 2025
ea6230f
Always install vcredist 2022
twangboy Apr 10, 2025
cecb0ff
Fix path on Windows
twangboy Apr 11, 2025
b550076
Bump relenv version to 0.19.0
dwoz Apr 14, 2025
ed85d7c
Handle psutil.ZombieProcess exception
dwoz Apr 15, 2025
6c77f7d
Skip 3006.x -> 3007.x upgrade/downgrade
dwoz Apr 15, 2025
2ecb105
Use target sha for PR version generation
dwoz Apr 15, 2025
6bb87f6
Fix merge warts
dwoz Apr 16, 2025
3c3275d
Pin package on upgrade too
dwoz Apr 16, 2025
20978ec
Skip tests that will not pass
dwoz Apr 16, 2025
653fa4a
Fix 3006 previous version check
dwoz Apr 16, 2025
f655b86
Add version to pkg workflow run name
dwoz Apr 16, 2025
c173297
More test fixes
dwoz Apr 16, 2025
21ff77c
Make tmp dir specific
dwoz Apr 16, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup-actionlint/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: Setup actionlint
inputs:
version:
description: The version of actionlint
default: 1.6.26
default: 1.7.7
cache-seed:
required: true
description: Seed used to invalidate caches
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -429,8 +429,8 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.18.1"
python-version: "3.10.16"
relenv-version: "0.19.0"
python-version: "3.10.17"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}

Expand All @@ -444,8 +444,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.18.1"
python-version: "3.10.16"
relenv-version: "0.19.0"
python-version: "3.10.17"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -461,7 +461,7 @@ jobs:
nox-version: 2022.8.7
python-version: "3.10"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.16
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -478,7 +478,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.16
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }}
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
Expand All @@ -496,7 +496,7 @@ jobs:
python-version: "3.10"
testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.16
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }}
workflow-slug: ci
default-timeout: 180
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/draft-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,21 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
release_name: "Release v${{ inputs.salt-version }}"
release_name: "v${{ inputs.salt-version }}"
tag_name: v${{ inputs.salt-version }}
draft: true
prerelease: false
- name: Release Output
run: echo "upload_url=${{ steps.create_release.outputs.upload_url }}" >> "$GITHUB_OUTPUT"

upload-release-patch:
needs:
- create-github-release
uses: ./.github/workflows/release-artifact.yml
with:
name: salt-${{ inputs.salt-version }}.patch
upload_url: ${{ needs.create-github-release.outputs.upload_url }}

upload-source-tarball:
needs:
- create-github-release
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -486,8 +486,8 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.18.1"
python-version: "3.10.16"
relenv-version: "0.19.0"
python-version: "3.10.17"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}

Expand All @@ -501,8 +501,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.18.1"
python-version: "3.10.16"
relenv-version: "0.19.0"
python-version: "3.10.17"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -521,8 +521,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.18.1"
python-version: "3.10.16"
relenv-version: "0.19.0"
python-version: "3.10.17"
source: "src"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -542,7 +542,7 @@ jobs:
nox-version: 2022.8.7
python-version: "3.10"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.16
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -559,7 +559,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.16
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
Expand All @@ -577,7 +577,7 @@ jobs:
python-version: "3.10"
testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.16
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
skip-code-coverage: true
workflow-slug: nightly
default-timeout: 360
Expand Down
84 changes: 0 additions & 84 deletions .github/workflows/release-tag.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/release-update-winrepo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:

- name: Create Pull Request
id: cpr
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v7
with:
path: winrepo
push-to-fork: saltbot-open/salt-winrepo-ng
Expand Down
Loading
Loading