Split Sentry enablement to be per-architecture. (#17383)
And only enable it on 64-bit x86 for the moment.
Austin S. Hemmelgarn committed
Apr 15, 2024 at 07:58 UTC
438c1120aee8b7d80d692d00e7d8a91a7c52c72b
2 files changed
+25
-15
.github/data/distros.yml
+24
-14
@@ -16,6 +16,14 @@ arch_order: # sort order for per-architecture jobs in CI
16
- armhfp
17
- arm64
18
- aarch64
19
+default_sentry: &default_sentry # Default configuration for Sentry usage
20
+ amd64: false
21
+ x86_64: false
22
+ i386: false
23
+ armhf: false
24
+ armhfp: false
25
+ arm64: false
26
+ aarch64: false
27
include:
28
- &alpine
29
distro: alpine
@@ -23,6 +31,7 @@ include:
31
support_type: Community
32
notes: ''
33
eol_check: false
34
+ bundle_sentry: *default_sentry
35
env_prep: |
36
apk add -U bash
37
jsonc_removal: |
@@ -34,7 +43,6 @@ include:
43
support_type: Core
44
notes: ''
45
eol_check: true
37
- bundle_sentry: false
46
- <<: *alpine
47
version: "3.18"
48
support_type: Core
@@ -56,7 +64,7 @@ include:
64
support_type: Intermediate
65
notes: ''
66
eol_check: false
59
- bundle_sentry: false
67
+ bundle_sentry: *default_sentry
68
env_prep: |
69
pacman --noconfirm -Syu && pacman --noconfirm -Sy grep libffi
70
test:
@@ -68,7 +76,7 @@ include:
76
support_type: Core
77
notes: ''
78
eol_check: 'amazon-linux'
71
- bundle_sentry: false
79
+ bundle_sentry: *default_sentry
80
packages: &amzn_packages
81
type: rpm
82
repo_distro: amazonlinux/2
@@ -92,7 +100,7 @@ include:
100
support_type: Core
101
notes: ''
102
eol_check: false
95
- bundle_sentry: false
103
+ bundle_sentry: *default_sentry
104
packages:
105
type: rpm
106
repo_distro: el/7
@@ -114,7 +122,7 @@ include:
122
jsonc_removal: |
123
dnf remove -y json-c-devel
124
eol_check: true
117
- bundle_sentry: false
125
+ bundle_sentry: *default_sentry
126
packages: &cs_packages
127
type: rpm
128
repo_distro: el/c9s
@@ -137,7 +145,9 @@ include:
145
notes: ''
146
base_image: debian:bookworm
147
eol_check: true
140
- bundle_sentry: true
148
+ bundle_sentry:
149
+ <<: *default_sentry
150
+ amd64: true
151
env_prep: |
152
apt-get update
153
jsonc_removal: |
@@ -163,7 +173,7 @@ include:
173
- <<: *debian
174
version: "10"
175
base_image: debian:buster
166
- bundle_sentry: false
176
+ bundle_sentry: *default_sentry
177
packages:
178
<<: *debian_packages
179
repo_distro: debian/buster
@@ -176,7 +186,7 @@ include:
186
support_type: Core
187
notes: ''
188
eol_check: true
179
- bundle_sentry: false
189
+ bundle_sentry: *default_sentry
190
jsonc_removal: |
191
dnf remove -y json-c-devel
192
packages: &fedora_packages
@@ -208,7 +218,7 @@ include:
218
support_type: Core
219
notes: ''
220
eol_check: true
211
- bundle_sentry: false
221
+ bundle_sentry: *default_sentry
222
base_image: opensuse/leap:15.5
223
jsonc_removal: |
224
zypper rm -y libjson-c-devel
@@ -227,7 +237,7 @@ include:
237
support_type: Core
238
notes: ''
239
eol_check: true
230
- bundle_sentry: false
240
+ bundle_sentry: *default_sentry
241
jsonc_removal: |
242
dnf remove -y json-c-devel
243
packages: &oracle_packages
@@ -252,7 +262,7 @@ include:
262
jsonc_removal: |
263
dnf remove -y json-c-devel
264
eol_check: true
255
- bundle_sentry: false
265
+ bundle_sentry: *default_sentry
266
packages: &rocky_packages
267
type: rpm
268
repo_distro: el/9
@@ -281,7 +291,9 @@ include:
291
support_type: Core
292
notes: ''
293
eol_check: true
284
- bundle_sentry: true
294
+ bundle_sentry:
295
+ <<: *default_sentry
296
+ amd64: true
297
env_prep: |
298
rm -f /etc/apt/apt.conf.d/docker && apt-get update
299
jsonc_removal: |
@@ -313,13 +325,11 @@ include:
325
legacy: # Info for platforms we used to support and still need to handle packages for
326
- <<: *fedora
327
version: "37"
316
- bundle_sentry: false
328
packages:
329
<<: *fedora_packages
330
repo_distro: fedora/37
331
- <<: *opensuse
332
version: "15.4"
322
- bundle_sentry: false
333
packages:
334
<<: *opensuse_packages
335
repo_distro: opensuse/15.4
.github/scripts/gen-matrix-packaging.py
+1
-1
@@ -28,7 +28,7 @@ for i, v in enumerate(data['include']):
28
'format': data['include'][i]['packages']['type'],
29
'base_image': data['include'][i]['base_image'] if 'base_image' in data['include'][i] else ':'.join([data['include'][i]['distro'], data['include'][i]['version']]),
30
'platform': data['platform_map'][arch],
31
- 'bundle_sentry': data['include'][i]['bundle_sentry'],
31
+ 'bundle_sentry': data['include'][i]['bundle_sentry'][arch],
32
'arch': arch
33
})
34