Просмотр исходного кода

Correctly fix repoconfig package uploads.

For real this time...
Austin S. Hemmelgarn 2 лет назад
Родитель
Сommit
5e9617c784
2 измененных файлов с 11 добавлено и 16 удалено
  1. 2 1
      .github/scripts/gen-matrix-repoconfig.py
  2. 9 15
      .github/workflows/repoconfig-packages.yml

+ 2 - 1
.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']))

+ 9 - 15
.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'