Skip to content

Commit 841ab52

Browse files
saltbot-opensaltbot-open
committed
Merge develop into stable for v2023.04.21 release
2 parents 03f4f9d + 8d0c7e4 commit 841ab52

23 files changed

Lines changed: 1526 additions & 268 deletions

‎.github/actionlint.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
self-hosted-runner:
2+
# Labels of self-hosted runner in array of string
3+
labels:
4+
- repo-release

‎.github/workflows/ci.yml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ jobs:
173173
display-name: macOS 10.15
174174
timeout: 20
175175
runs-on: macos-10.15
176-
instances: '["stable-3003", "stable-3004", "stable-3005", "latest"]'
176+
instances: '["stable-3003", "stable-3004", "stable-3005", "stable-3006", "latest"]'
177177

178178

179179
macos-11:
@@ -188,7 +188,7 @@ jobs:
188188
display-name: macOS 11
189189
timeout: 20
190190
runs-on: macos-11
191-
instances: '["stable-3003", "stable-3004", "stable-3005", "latest"]'
191+
instances: '["stable-3003", "stable-3004", "stable-3005", "stable-3006", "latest"]'
192192

193193

194194
macos-12:
@@ -203,7 +203,7 @@ jobs:
203203
display-name: macOS 12
204204
timeout: 20
205205
runs-on: macos-12
206-
instances: '["stable-3003", "stable-3004", "stable-3005", "latest"]'
206+
instances: '["stable-3003", "stable-3004", "stable-3005", "stable-3006", "latest"]'
207207

208208

209209

@@ -219,7 +219,7 @@ jobs:
219219
display-name: Windows 2019
220220
timeout: 20
221221
runs-on: windows-2019
222-
instances: '["stable-3003", "stable-3004", "stable-3005", "latest"]'
222+
instances: '["stable-3003", "stable-3004", "stable-3005", "stable-3006", "latest"]'
223223

224224

225225
windows-2022:
@@ -234,7 +234,7 @@ jobs:
234234
display-name: Windows 2022
235235
timeout: 20
236236
runs-on: windows-2022
237-
instances: '["stable-3003", "stable-3004", "stable-3005", "latest"]'
237+
instances: '["stable-3003", "stable-3004", "stable-3005", "stable-3006", "latest"]'
238238

239239

240240

@@ -249,7 +249,7 @@ jobs:
249249
distro-slug: almalinux-8
250250
display-name: AlmaLinux 8
251251
timeout: 20
252-
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
252+
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest"]'
253253

254254

255255
almalinux-9:
@@ -263,7 +263,7 @@ jobs:
263263
distro-slug: almalinux-9
264264
display-name: AlmaLinux 9
265265
timeout: 20
266-
instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
266+
instances: '["git-3005", "onedir-3005", "onedir-3006", "git-master"]'
267267

268268

269269
amazon-2:
@@ -277,7 +277,7 @@ jobs:
277277
distro-slug: amazon-2
278278
display-name: Amazon 2
279279
timeout: 20
280-
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
280+
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest"]'
281281

282282

283283
arch:
@@ -305,7 +305,7 @@ jobs:
305305
distro-slug: centos-7
306306
display-name: CentOS 7
307307
timeout: 20
308-
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
308+
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest"]'
309309

310310

311311
centos-stream8:
@@ -319,7 +319,7 @@ jobs:
319319
distro-slug: centos-stream8
320320
display-name: CentOS Stream 8
321321
timeout: 20
322-
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
322+
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest"]'
323323

324324

325325
centos-stream9:
@@ -333,7 +333,7 @@ jobs:
333333
distro-slug: centos-stream9
334334
display-name: CentOS Stream 9
335335
timeout: 20
336-
instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
336+
instances: '["git-3005", "onedir-3005", "onedir-3006", "git-master"]'
337337

338338

339339
debian-10:
@@ -347,7 +347,7 @@ jobs:
347347
distro-slug: debian-10
348348
display-name: Debian 10
349349
timeout: 20
350-
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
350+
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest"]'
351351

352352

353353
debian-11:
@@ -361,7 +361,7 @@ jobs:
361361
distro-slug: debian-11
362362
display-name: Debian 11
363363
timeout: 20
364-
instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
364+
instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest"]'
365365

366366

367367
fedora-35:
@@ -487,7 +487,7 @@ jobs:
487487
distro-slug: oraclelinux-7
488488
display-name: Oracle Linux 7
489489
timeout: 20
490-
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
490+
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest"]'
491491

492492

493493
oraclelinux-8:
@@ -501,7 +501,7 @@ jobs:
501501
distro-slug: oraclelinux-8
502502
display-name: Oracle Linux 8
503503
timeout: 20
504-
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
504+
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest"]'
505505

506506

507507
rockylinux-8:
@@ -515,7 +515,7 @@ jobs:
515515
distro-slug: rockylinux-8
516516
display-name: Rocky Linux 8
517517
timeout: 20
518-
instances: '["stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
518+
instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest"]'
519519

520520

521521
rockylinux-9:
@@ -529,7 +529,7 @@ jobs:
529529
distro-slug: rockylinux-9
530530
display-name: Rocky Linux 9
531531
timeout: 20
532-
instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
532+
instances: '["git-3005", "onedir-3005", "onedir-3006", "git-master"]'
533533

534534

535535
ubuntu-2004:
@@ -543,7 +543,7 @@ jobs:
543543
distro-slug: ubuntu-2004
544544
display-name: Ubuntu 20.04
545545
timeout: 20
546-
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
546+
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest"]'
547547

548548

549549
ubuntu-2204:
@@ -557,7 +557,7 @@ jobs:
557557
distro-slug: ubuntu-2204
558558
display-name: Ubuntu 22.04
559559
timeout: 20
560-
instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
560+
instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest"]'
561561

562562

563563
set-pipeline-exit-status:

‎.github/workflows/nightly.yml‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
name: Nightly S3 Update
2+
run-name: "Nightly S3 (branch: ${{ github.ref_name }})"
3+
4+
on:
5+
workflow_dispatch: {}
6+
schedule:
7+
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onschedule
8+
- cron: '0 1 * * *' # Every day at 1AM
9+
10+
jobs:
11+
12+
workflow-requirements:
13+
name: Check Workflow Requirements
14+
runs-on: ubuntu-latest
15+
outputs:
16+
requirements-met: ${{ steps.check-requirements.outputs.requirements-met }}
17+
steps:
18+
- name: Check For Admin Permission
19+
if: ${{ github.event_name != 'schedule' }}
20+
uses: actions-cool/check-user-permission@v2
21+
with:
22+
require: admin
23+
username: ${{ github.triggering_actor }}
24+
25+
- name: Check Requirements
26+
id: check-requirements
27+
run: |
28+
if [ "${{ vars.RUN_SCHEDULED_BUILDS }}" = "1" ]; then
29+
MSG="Running workflow because RUN_SCHEDULED_BUILDS=1"
30+
echo "${MSG}"
31+
echo "${MSG}" >> "${GITHUB_STEP_SUMMARY}"
32+
echo "requirements-met=true" >> "${GITHUB_OUTPUT}"
33+
elif [ "${{ github.event.repository.fork }}" = "true" ]; then
34+
MSG="Not running workflow because ${{ github.repository }} is a fork"
35+
echo "${MSG}"
36+
echo "${MSG}" >> "${GITHUB_STEP_SUMMARY}"
37+
echo "requirements-met=false" >> "${GITHUB_OUTPUT}"
38+
else
39+
MSG="Running workflow because ${{ github.repository }} is not a fork"
40+
echo "${MSG}"
41+
echo "${MSG}" >> "${GITHUB_STEP_SUMMARY}"
42+
echo "requirements-met=true" >> "${GITHUB_OUTPUT}"
43+
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@v3
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)