Skip to content

Commit bb3ab6b

Browse files
saltbot-opensaltbot-open
committed
Merge develop into stable for v2024.11.21 release
2 parents 0624dcd + f2abbd4 commit bb3ab6b

File tree

13 files changed

+807
-810
lines changed

13 files changed

+807
-810
lines changed

‎.github/workflows/ci.yml

Lines changed: 23 additions & 209 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ jobs:
124124
with:
125125
distro-slug: macos-12
126126
display-name: macOS 12
127+
container-slug: macos-12
127128
timeout: 20
128129
runs-on: macos-12
129130
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
@@ -139,194 +140,44 @@ jobs:
139140
with:
140141
distro-slug: macos-13
141142
display-name: macOS 13
143+
container-slug: macos-13
142144
timeout: 20
143145
runs-on: macos-13
144146
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
145147

146148

147-
148-
windows-2022:
149-
name: Windows 2022
149+
macos-14:
150+
name: macOS 14
150151
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
151-
uses: ./.github/workflows/test-windows.yml
152+
uses: ./.github/workflows/test-macos.yml
152153
needs:
153154
- lint
154155
- generate-actions-workflow
155156
with:
156-
distro-slug: windows-2022
157-
display-name: Windows 2022
157+
distro-slug: macos-14
158+
display-name: macOS 14
159+
container-slug: macOS 14
158160
timeout: 20
159-
runs-on: windows-2022
161+
runs-on: macos-14
160162
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
161163

162164

163165

164-
almalinux-8:
165-
name: AlmaLinux 8
166-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
167-
uses: ./.github/workflows/test-linux.yml
168-
needs:
169-
- lint
170-
- generate-actions-workflow
171-
with:
172-
distro-slug: almalinux-8
173-
display-name: AlmaLinux 8
174-
timeout: 20
175-
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
176-
177-
178-
almalinux-9:
179-
name: AlmaLinux 9
180-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
181-
uses: ./.github/workflows/test-linux.yml
182-
needs:
183-
- lint
184-
- generate-actions-workflow
185-
with:
186-
distro-slug: almalinux-9
187-
display-name: AlmaLinux 9
188-
timeout: 20
189-
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
190-
191-
192-
amazon-2:
193-
name: Amazon 2
194-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
195-
uses: ./.github/workflows/test-linux.yml
196-
needs:
197-
- lint
198-
- generate-actions-workflow
199-
with:
200-
distro-slug: amazon-2
201-
display-name: Amazon 2
202-
timeout: 20
203-
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
204-
205-
206-
centos-stream9:
207-
name: CentOS Stream 9
208-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
209-
uses: ./.github/workflows/test-linux.yml
210-
needs:
211-
- lint
212-
- generate-actions-workflow
213-
with:
214-
distro-slug: centos-stream9
215-
display-name: CentOS Stream 9
216-
timeout: 20
217-
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
218-
219-
220-
debian-11:
221-
name: Debian 11
222-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
223-
uses: ./.github/workflows/test-linux.yml
224-
needs:
225-
- lint
226-
- generate-actions-workflow
227-
with:
228-
distro-slug: debian-11
229-
display-name: Debian 11
230-
timeout: 20
231-
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
232-
233-
234-
debian-12:
235-
name: Debian 12
236-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
237-
uses: ./.github/workflows/test-linux.yml
238-
needs:
239-
- lint
240-
- generate-actions-workflow
241-
with:
242-
distro-slug: debian-12
243-
display-name: Debian 12
244-
timeout: 20
245-
instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
246-
247-
248-
fedora-39:
249-
name: Fedora 39
250-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
251-
uses: ./.github/workflows/test-linux.yml
252-
needs:
253-
- lint
254-
- generate-actions-workflow
255-
with:
256-
distro-slug: fedora-39
257-
display-name: Fedora 39
258-
timeout: 20
259-
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "latest", "default"]'
260-
261-
262-
fedora-40:
263-
name: Fedora 40
264-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
265-
uses: ./.github/workflows/test-linux.yml
266-
needs:
267-
- lint
268-
- generate-actions-workflow
269-
with:
270-
distro-slug: fedora-40
271-
display-name: Fedora 40
272-
timeout: 20
273-
instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
274-
275-
276-
opensuse-15:
277-
name: Opensuse 15
278-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
279-
uses: ./.github/workflows/test-linux.yml
280-
needs:
281-
- lint
282-
- generate-actions-workflow
283-
with:
284-
distro-slug: opensuse-15
285-
display-name: Opensuse 15
286-
timeout: 20
287-
instances: '["latest", "default"]'
288-
289-
290-
oraclelinux-8:
291-
name: Oracle Linux 8
292-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
293-
uses: ./.github/workflows/test-linux.yml
294-
needs:
295-
- lint
296-
- generate-actions-workflow
297-
with:
298-
distro-slug: oraclelinux-8
299-
display-name: Oracle Linux 8
300-
timeout: 20
301-
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
302-
303-
304-
oraclelinux-9:
305-
name: Oracle Linux 9
166+
windows-2022:
167+
name: Windows 2022
306168
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
307-
uses: ./.github/workflows/test-linux.yml
169+
uses: ./.github/workflows/test-windows.yml
308170
needs:
309171
- lint
310172
- generate-actions-workflow
311173
with:
312-
distro-slug: oraclelinux-9
313-
display-name: Oracle Linux 9
174+
distro-slug: windows-2022
175+
display-name: Windows 2022
176+
container-slug: windows-2022
314177
timeout: 20
315-
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
316-
178+
runs-on: windows-2022
179+
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
317180

318-
photon-4:
319-
name: Photon OS 4
320-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
321-
uses: ./.github/workflows/test-linux.yml
322-
needs:
323-
- lint
324-
- generate-actions-workflow
325-
with:
326-
distro-slug: photon-4
327-
display-name: Photon OS 4
328-
timeout: 20
329-
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "latest", "default"]'
330181

331182

332183
photon-5:
@@ -339,6 +190,7 @@ jobs:
339190
with:
340191
distro-slug: photon-5
341192
display-name: Photon OS 5
193+
container-slug: systemd-photon-5
342194
timeout: 20
343195
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "latest", "default"]'
344196

@@ -353,6 +205,7 @@ jobs:
353205
with:
354206
distro-slug: rockylinux-8
355207
display-name: Rocky Linux 8
208+
container-slug: systemd-rockylinux-8
356209
timeout: 20
357210
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
358211

@@ -367,22 +220,9 @@ jobs:
367220
with:
368221
distro-slug: rockylinux-9
369222
display-name: Rocky Linux 9
223+
container-slug: systemd-rockylinux-9
370224
timeout: 20
371-
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
372-
373-
374-
ubuntu-2004:
375-
name: Ubuntu 20.04
376-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
377-
uses: ./.github/workflows/test-linux.yml
378-
needs:
379-
- lint
380-
- generate-actions-workflow
381-
with:
382-
distro-slug: ubuntu-2004
383-
display-name: Ubuntu 20.04
384-
timeout: 20
385-
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
225+
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
386226

387227

388228
ubuntu-2204:
@@ -395,24 +235,11 @@ jobs:
395235
with:
396236
distro-slug: ubuntu-2204
397237
display-name: Ubuntu 22.04
238+
container-slug: systemd-ubuntu-22.04
398239
timeout: 20
399240
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
400241

401242

402-
ubuntu-2404:
403-
name: Ubuntu 24.04
404-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
405-
uses: ./.github/workflows/test-linux.yml
406-
needs:
407-
- lint
408-
- generate-actions-workflow
409-
with:
410-
distro-slug: ubuntu-2404
411-
display-name: Ubuntu 24.04
412-
timeout: 20
413-
instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
414-
415-
416243
set-pipeline-exit-status:
417244
# This step is just so we can make github require this step, to pass checks
418245
# on a pull request instead of requiring all
@@ -423,25 +250,12 @@ jobs:
423250
- generate-actions-workflow
424251
- macos-12
425252
- macos-13
253+
- macos-14
426254
- windows-2022
427-
- almalinux-8
428-
- almalinux-9
429-
- amazon-2
430-
- centos-stream9
431-
- debian-11
432-
- debian-12
433-
- fedora-39
434-
- fedora-40
435-
- opensuse-15
436-
- oraclelinux-8
437-
- oraclelinux-9
438-
- photon-4
439255
- photon-5
440256
- rockylinux-8
441257
- rockylinux-9
442-
- ubuntu-2004
443258
- ubuntu-2204
444-
- ubuntu-2404
445259
if: always()
446260
steps:
447261

‎.github/workflows/nightly.yml

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -41,61 +41,3 @@ jobs:
4141
echo "${MSG}" >> "${GITHUB_STEP_SUMMARY}"
4242
echo "requirements-met=true" >> "${GITHUB_OUTPUT}"
4343
fi
44-
45-
update-s3-bucket:
46-
name: Update S3 Bucket
47-
if: ${{ fromJSON(needs.workflow-requirements.outputs.requirements-met) }}
48-
runs-on:
49-
- self-hosted
50-
- linux
51-
- repo-release
52-
needs:
53-
- workflow-requirements
54-
environment: release
55-
56-
steps:
57-
- uses: actions/checkout@v4
58-
59-
- name: Get Salt Project GitHub Actions Bot Environment
60-
run: |
61-
TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30")
62-
SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment)
63-
echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV"
64-
65-
- name: Setup GnuPG
66-
run: |
67-
sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg
68-
GNUPGHOME="$(mktemp -d -p /run/gpg)"
69-
echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV"
70-
cat <<EOF > "${GNUPGHOME}/gpg.conf"
71-
batch
72-
no-tty
73-
pinentry-mode loopback
74-
EOF
75-
76-
- name: Get Secrets
77-
id: get-secrets
78-
env:
79-
SECRETS_KEY: ${{ secrets.SECRETS_KEY }}
80-
run: |
81-
SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX)
82-
echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE"
83-
aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \
84-
--query SecretString --output text | jq .default_key -r | base64 -d \
85-
| gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \
86-
| gpg --import -
87-
sync
88-
aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \
89-
--query SecretString --output text| jq .default_passphrase -r | base64 -d \
90-
| gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d -
91-
sync
92-
rm "$SECRETS_KEY_FILE"
93-
echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf"
94-
95-
- name: Install Requirements
96-
run: |
97-
python3 -m pip install -r requirements/release.txt
98-
99-
- name: Upload Develop to S3
100-
run: |
101-
tools release s3-publish --key-id 64CBBC8173D76B3F develop

0 commit comments

Comments
 (0)