Correctly fix repoconfig package uploads.
For real this time...
Austin S. Hemmelgarn committed
Dec 14, 2022 at 10:36 UTC
5e9617c784d695cd4eec39773da875cd3e7f1ce2
2 files changed
+11
-16
.github/scripts/gen-matrix-repoconfig.py
+2
-1
@@ -18,7 +18,8 @@ for i, v in enumerate(data['include']):
18
'pkgclouddistro': data['include'][i]['packages']['repo_distro'],
19
'format': data['include'][i]['packages']['type'],
20
'base_image': data['include'][i]['base_image'] if 'base_image' in data['include'][i] else data['include'][i]['distro'],
21
- 'platform': data['platform_map']['amd64']
21
+ 'platform': data['platform_map']['amd64'],
22
+ 'arches': data['include'][i]['packages']['arches']
23
})
24
25
entries.sort(key=lambda k: (k['distro'], k['version']))
.github/workflows/repoconfig-packages.yml
+9
-15
@@ -108,21 +108,15 @@ jobs:
108
continue-on-error: true
109
if: github.event_name != 'pull_request' && github.repository == 'netdata/netdata'
110
run: |
111
- .github/scripts/package-upload.sh \
112
- ${{ matrix.pkgclouddistro }} \
113
- ${{ matrix.platform }} \
114
- ${{ matrix.format }} \
115
- netdata/netdata
116
- .github/scripts/package-upload.sh \
117
- ${{ matrix.pkgclouddistro }} \
118
- ${{ matrix.platform }} \
119
- ${{ matrix.format }} \
120
- netdata/netdata-edge
121
- .github/scripts/package-upload.sh \
122
- ${{ matrix.pkgclouddistro }} \
123
- ${{ matrix.platform }} \
124
- ${{ matrix.format }} \
125
- netdata/netdata-repoconfig
111
+ for arch in ${{ matrix.arches }}; do
112
+ for suffix in '' -edge -repoconfig ; do
113
+ .github/scripts/package-upload.sh \
114
+ ${{ matrix.pkgclouddistro }} \
115
+ ${arch} \
116
+ ${{ matrix.format }} \
117
+ netdata/netdata${suffix}
118
+ done
119
+ done
120
- name: Upload Packages
121
id: publish
122
if: github.event_name != 'pull_request' && github.repository == 'netdata/netdata'