diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2022-12-14 10:36:05 -0500 |
|---|---|---|
| committer | Austin S. Hemmelgarn <austin@netdata.cloud> | 2022-12-14 10:36:05 -0500 |
| commit | 5e9617c784d695cd4eec39773da875cd3e7f1ce2 (patch) | |
| tree | ba6181818b8bb75b8982d62f117edadd129f3acb /.github | |
| parent | 90166dc517268d56ec7858e012d160ebae53c58e (diff) | |
Correctly fix repoconfig package uploads.
For real this time...
Diffstat (limited to '.github')
| -rwxr-xr-x | .github/scripts/gen-matrix-repoconfig.py | 3 | ||||
| -rw-r--r-- | .github/workflows/repoconfig-packages.yml | 24 |
2 files changed, 11 insertions, 16 deletions
diff --git a/.github/scripts/gen-matrix-repoconfig.py b/.github/scripts/gen-matrix-repoconfig.py index 01e6c7f8b6..78fc4a64fe 100755 --- a/.github/scripts/gen-matrix-repoconfig.py +++ b/.github/scripts/gen-matrix-repoconfig.py @@ -18,7 +18,8 @@ for i, v in enumerate(data['include']): 'pkgclouddistro': data['include'][i]['packages']['repo_distro'], 'format': data['include'][i]['packages']['type'], 'base_image': data['include'][i]['base_image'] if 'base_image' in data['include'][i] else data['include'][i]['distro'], - 'platform': data['platform_map']['amd64'] + 'platform': data['platform_map']['amd64'], + 'arches': data['include'][i]['packages']['arches'] }) entries.sort(key=lambda k: (k['distro'], k['version'])) diff --git a/.github/workflows/repoconfig-packages.yml b/.github/workflows/repoconfig-packages.yml index 7cb4e00988..f8a3dc4066 100644 --- a/.github/workflows/repoconfig-packages.yml +++ b/.github/workflows/repoconfig-packages.yml @@ -108,21 +108,15 @@ jobs: continue-on-error: true if: github.event_name != 'pull_request' && github.repository == 'netdata/netdata' run: | - .github/scripts/package-upload.sh \ - ${{ matrix.pkgclouddistro }} \ - ${{ matrix.platform }} \ - ${{ matrix.format }} \ - netdata/netdata - .github/scripts/package-upload.sh \ - ${{ matrix.pkgclouddistro }} \ - ${{ matrix.platform }} \ - ${{ matrix.format }} \ - netdata/netdata-edge - .github/scripts/package-upload.sh \ - ${{ matrix.pkgclouddistro }} \ - ${{ matrix.platform }} \ - ${{ matrix.format }} \ - netdata/netdata-repoconfig + for arch in ${{ matrix.arches }}; do + for suffix in '' -edge -repoconfig ; do + .github/scripts/package-upload.sh \ + ${{ matrix.pkgclouddistro }} \ + ${arch} \ + ${{ matrix.format }} \ + netdata/netdata${suffix} + done + done - name: Upload Packages id: publish if: github.event_name != 'pull_request' && github.repository == 'netdata/netdata' |