Skip to content

Commit 6f4ed89

Browse files
saltbot-opensaltbot-open
committed
Merge develop into stable for v2024.09.24 release
2 parents 5e3c4e2 + 8da0764 commit 6f4ed89

File tree

14 files changed

+141
-84
lines changed

14 files changed

+141
-84
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ jobs:
4949
if: always()
5050
uses: actions/upload-artifact@v4
5151
with:
52-
name: exitstatus
53-
path: exitstatus
52+
name: exitstatus-${{ github.job }}
53+
path: exitstatus/
5454

5555
generate-actions-workflow:
5656
name: Generate The Actions Workflow
@@ -62,7 +62,7 @@ jobs:
6262
- uses: actions/checkout@v4
6363

6464
- name: Set up Python 3.10
65-
uses: actions/setup-python@v4
65+
uses: actions/setup-python@v5
6666
with:
6767
python-version: "3.10"
6868

@@ -86,8 +86,8 @@ jobs:
8686
if: always()
8787
uses: actions/upload-artifact@v4
8888
with:
89-
name: exitstatus
90-
path: exitstatus
89+
name: exitstatus-${{ github.job }}
90+
path: exitstatus/
9191

9292
lint:
9393
name: Lint
@@ -111,8 +111,8 @@ jobs:
111111
if: always()
112112
uses: actions/upload-artifact@v4
113113
with:
114-
name: exitstatus
115-
path: exitstatus
114+
name: exitstatus-${{ github.job }}
115+
path: exitstatus/
116116

117117

118118

@@ -346,20 +346,6 @@ jobs:
346346
instances: '["latest", "default"]'
347347

348348

349-
opensuse-tumbleweed:
350-
name: Opensuse Tumbleweed
351-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
352-
uses: ./.github/workflows/test-linux.yml
353-
needs:
354-
- lint
355-
- generate-actions-workflow
356-
with:
357-
distro-slug: opensuse-tumbleweed
358-
display-name: Opensuse Tumbleweed
359-
timeout: 20
360-
instances: '["git-master", "latest", "default"]'
361-
362-
363349
oraclelinux-8:
364350
name: Oracle Linux 8
365351
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -510,7 +496,6 @@ jobs:
510496
- gentoo
511497
- gentoo-systemd
512498
- opensuse-15
513-
- opensuse-tumbleweed
514499
- oraclelinux-8
515500
- oraclelinux-9
516501
- photon-4
@@ -527,14 +512,15 @@ jobs:
527512
if: always()
528513
uses: actions/download-artifact@v4
529514
with:
530-
name: exitstatus
531-
path: exitstatus
515+
path: exitstatus/
516+
pattern: exitstatus-*
517+
merge-multiple: true
532518

533519
- name: Delete Exit Status Artifacts
534520
if: always()
535521
uses: geekyeggo/delete-artifact@v5
536522
with:
537-
name: exitstatus
523+
pattern: exitstatus-*
538524
failOnError: false
539525

540526
- name: Set Pipeline Exit Status

‎.github/workflows/nightly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
environment: release
5555

5656
steps:
57-
- uses: actions/checkout@v3
57+
- uses: actions/checkout@v4
5858

5959
- name: Get Salt Project GitHub Actions Bot Environment
6060
run: |

‎.github/workflows/release.yml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
outputs:
6464
release-version: ${{ steps.update-repo.outputs.release-version }}
6565
steps:
66-
- uses: actions/checkout@v3
66+
- uses: actions/checkout@v4
6767
with:
6868
ref: develop
6969
repository: ${{ github.repository }}
@@ -139,12 +139,13 @@ jobs:
139139
repository: ${{ github.repository }}
140140

141141
- name: Upload Release Details
142-
uses: actions/upload-artifact@v3
142+
uses: actions/upload-artifact@v4
143143
with:
144144
name: release-details
145145
path: |
146146
.cut_release_version
147147
.cut_release_changes
148+
include-hidden-files: true
148149

149150
merge-develop-into-stable:
150151
name: Merge develop into stable
@@ -158,7 +159,7 @@ jobs:
158159
permissions:
159160
contents: write # To be able to publish the release
160161
steps:
161-
- uses: actions/checkout@v3
162+
- uses: actions/checkout@v4
162163
with:
163164
ref: stable
164165
repository: ${{ github.repository }}
@@ -205,7 +206,7 @@ jobs:
205206
git config --global commit.gpgsign true
206207
207208
- name: Download Release Details
208-
uses: actions/download-artifact@v3
209+
uses: actions/download-artifact@v4
209210
with:
210211
name: release-details
211212

@@ -254,13 +255,14 @@ jobs:
254255
permissions:
255256
contents: write # To be able to publish the release
256257
steps:
257-
- uses: actions/checkout@v3
258+
- uses: actions/checkout@v4
258259
with:
259260
ref: stable
260261
repository: ${{ github.repository }}
261262
ssh-key: ${{ secrets.SALT_BOOTSTRAP_RELEASE_KEY }}
263+
262264
- name: Download Release Details
263-
uses: actions/download-artifact@v3
265+
uses: actions/download-artifact@v4
264266
with:
265267
name: release-details
266268

@@ -287,7 +289,7 @@ jobs:
287289
LICENSE
288290
289291
- name: Delete Release Details Artifact
290-
uses: geekyeggo/delete-artifact@v2
292+
uses: geekyeggo/delete-artifact@v5
291293
with:
292294
name: release-details
293295
failOnError: false
@@ -303,7 +305,7 @@ jobs:
303305
environment: release
304306

305307
steps:
306-
- uses: actions/checkout@v3
308+
- uses: actions/checkout@v4
307309
with:
308310
ref: stable
309311
repository: ${{ github.repository }}
@@ -367,7 +369,7 @@ jobs:
367369
pull-requests: write # For action peter-evans/create-pull-request
368370

369371
steps:
370-
- uses: actions/checkout@v3
372+
- uses: actions/checkout@v4
371373
with:
372374
ref: stable
373375
repository: ${{ github.repository }}
@@ -378,7 +380,7 @@ jobs:
378380
echo "SH=$(sha256sum bootstrap-salt.sh | awk '{ print $1 }')" >> "$GITHUB_ENV"
379381
echo "BS_VERSION=$(sh bootstrap-salt.sh -v | awk '{ print $4 }')" >> "$GITHUB_ENV"
380382
381-
- uses: actions/checkout@v3
383+
- uses: actions/checkout@v4
382384
with:
383385
ref: develop
384386
repository: ${{ github.repository }}

‎.github/workflows/templates/ci-tail.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@
1313
if: always()
1414
uses: actions/download-artifact@v4
1515
with:
16-
name: exitstatus
17-
path: exitstatus
16+
path: exitstatus/
17+
pattern: exitstatus-*
18+
merge-multiple: true
1819

1920
- name: Delete Exit Status Artifacts
2021
if: always()
2122
uses: geekyeggo/delete-artifact@v5
2223
with:
23-
name: exitstatus
24+
pattern: exitstatus-*
2425
failOnError: false
2526

2627
- name: Set Pipeline Exit Status

‎.github/workflows/templates/ci.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ jobs:
4949
if: always()
5050
uses: actions/upload-artifact@v4
5151
with:
52-
name: exitstatus
53-
path: exitstatus
52+
name: exitstatus-${{ github.job }}
53+
path: exitstatus/
5454

5555
generate-actions-workflow:
5656
name: Generate The Actions Workflow
@@ -62,7 +62,7 @@ jobs:
6262
- uses: actions/checkout@v4
6363

6464
- name: Set up Python 3.10
65-
uses: actions/setup-python@v4
65+
uses: actions/setup-python@v5
6666
with:
6767
python-version: "3.10"
6868

@@ -86,8 +86,8 @@ jobs:
8686
if: always()
8787
uses: actions/upload-artifact@v4
8888
with:
89-
name: exitstatus
90-
path: exitstatus
89+
name: exitstatus-${{ github.job }}
90+
path: exitstatus/
9191

9292
lint:
9393
name: Lint
@@ -111,5 +111,5 @@ jobs:
111111
if: always()
112112
uses: actions/upload-artifact@v4
113113
with:
114-
name: exitstatus
115-
path: exitstatus
114+
name: exitstatus-${{ github.job }}
115+
path: exitstatus/

‎.github/workflows/templates/generate.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
os.chdir(os.path.abspath(os.path.dirname(__file__)))
88

99
## "amazon-2023",
10+
## "opensuse-tumbleweed",
1011
LINUX_DISTROS = [
1112
"almalinux-8",
1213
"almalinux-9",
@@ -20,7 +21,6 @@
2021
"gentoo",
2122
"gentoo-systemd",
2223
"opensuse-15",
23-
"opensuse-tumbleweed",
2424
"oraclelinux-8",
2525
"oraclelinux-9",
2626
"photon-4",
@@ -43,6 +43,7 @@
4343

4444

4545
## "amazon-2023",
46+
## "opensuse-tumbleweed",
4647
STABLE_DISTROS = [
4748
"almalinux-8",
4849
"almalinux-9",
@@ -54,7 +55,6 @@
5455
"fedora-39",
5556
"fedora-40",
5657
"opensuse-15",
57-
"opensuse-tumbleweed",
5858
"oraclelinux-8",
5959
"oraclelinux-9",
6060
"photon-4",
@@ -99,29 +99,30 @@
9999
"ubuntu-2404",
100100
]
101101

102+
## "opensuse-tumbleweed",
102103
BLACKLIST_3006 = [
103104
"arch",
104105
"debian-12",
105106
"fedora-40",
106107
"gentoo",
107108
"gentoo-systemd",
108109
"opensuse-15",
109-
"opensuse-tumbleweed",
110110
"ubuntu-2404",
111111
]
112112

113+
## "opensuse-tumbleweed",
113114
BLACKLIST_3007 = [
114115
"arch",
115116
"fedora-39",
116117
"gentoo",
117118
"gentoo-systemd",
118119
"opensuse-15",
119-
"opensuse-tumbleweed",
120120
"photon-4",
121121
"photon-5",
122122
]
123123

124124
## "amazon-2023",
125+
## "opensuse-tumbleweed",
125126
BLACKLIST_GIT_3006 = [
126127
"almalinux-9",
127128
"amazon-2",
@@ -133,7 +134,6 @@
133134
"gentoo",
134135
"gentoo-systemd",
135136
"opensuse-15",
136-
"opensuse-tumbleweed",
137137
"oraclelinux-9",
138138
"photon-4",
139139
"photon-5",
@@ -144,6 +144,7 @@
144144
]
145145

146146
## "amazon-2023",
147+
## "opensuse-tumbleweed",
147148
BLACKLIST_GIT_3007 = [
148149
"almalinux-9",
149150
"amazon-2",
@@ -156,7 +157,6 @@
156157
"gentoo",
157158
"gentoo-systemd",
158159
"opensuse-15",
159-
"opensuse-tumbleweed",
160160
"oraclelinux-9",
161161
"photon-4",
162162
"photon-5",
@@ -240,6 +240,7 @@
240240
]
241241

242242
## "amazon-2023": "Amazon 2023",
243+
## "opensuse-tumbleweed": "Opensuse Tumbleweed",
243244
DISTRO_DISPLAY_NAMES = {
244245
"almalinux-8": "AlmaLinux 8",
245246
"almalinux-9": "AlmaLinux 9",
@@ -253,7 +254,6 @@
253254
"gentoo": "Gentoo",
254255
"gentoo-systemd": "Gentoo (systemd)",
255256
"opensuse-15": "Opensuse 15",
256-
"opensuse-tumbleweed": "Opensuse Tumbleweed",
257257
"oraclelinux-8": "Oracle Linux 8",
258258
"oraclelinux-9": "Oracle Linux 9",
259259
"photon-4": "Photon OS 4",

‎.github/workflows/test-linux.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
bundler-cache: true
4646

4747
- name: Set up Python 3.10
48-
uses: actions/setup-python@v4
48+
uses: actions/setup-python@v5
4949
with:
5050
python-version: "3.10"
5151

@@ -79,7 +79,7 @@ jobs:
7979
8080
- name: Upload Exit Status
8181
if: always()
82-
uses: actions/upload-artifact@v3
82+
uses: actions/upload-artifact@v4
8383
with:
84-
name: exitstatus
85-
path: exitstatus
84+
name: exitstatus-${{ github.job }}-${{ matrix.instance }}-${{ inputs.distro-slug }}
85+
path: exitstatus/

‎.github/workflows/test-macos.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
bundler-cache: true
5353

5454
- name: Set up Python 3.10
55-
uses: actions/setup-python@v4
55+
uses: actions/setup-python@v5
5656
with:
5757
python-version: "3.10"
5858

@@ -86,7 +86,7 @@ jobs:
8686
8787
- name: Upload Exit Status
8888
if: always()
89-
uses: actions/upload-artifact@v3
89+
uses: actions/upload-artifact@v4
9090
with:
91-
name: exitstatus
92-
path: exitstatus
91+
name: exitstatus-${{ github.job }}-${{ matrix.instance }}-${{ inputs.distro-slug }}
92+
path: exitstatus/

0 commit comments

Comments
 (0)