Skip to content

Commit d036b11

Browse files
authored
Merge pull request #66178 from s0undt3ch/hotfix/merge-forward-into-master
[master] Merge 3007.x into master
2 parents 127a32e + d6e72e1 commit d036b11

2,238 files changed

Lines changed: 41984 additions & 51033 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/workflows/ci.yml

Lines changed: 88 additions & 179 deletions
Large diffs are not rendered by default.

.github/workflows/lint-action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
if: ${{ contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['salt'] || fromJSON(inputs.changed-files)['lint'] }}
2424

2525
container:
26-
image: ghcr.io/saltstack/salt-ci-containers/python:3.8
26+
image: ghcr.io/saltstack/salt-ci-containers/python:3.9
2727

2828
steps:
2929
- name: Install System Deps

0 commit comments

Comments
 (0)