From 2c3fd6427d2cf490dbe64aa119cde11a2e50a06e Mon Sep 17 00:00:00 2001 From: "Austin S. Hemmelgarn" Date: Wed, 29 Jun 2022 03:04:39 -0400 Subject: [PATCH 1/3] Fix build matrix generation for build workflow. --- .github/workflows/build.yml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 16196342b45846..115406b54a8872 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -173,19 +173,24 @@ jobs: from ruamel.yaml import YAML import json yaml = YAML(typ='safe') + entries = list() + with open('.github/data/distros.yml') as f: data = yaml.load(f) - del data['platform_map'] + for i, v in enumerate(data['include']): - data['include'][i]['artifact_key'] = data['include'][i]['distro'] + str(data['include'][i]['version']).replace('.', '') - if 'packages' in data['include'][i]: - del data['include'][i]['packages'] - if 'base_image' in data['include'][i]: - data['include'][i]['distro'] = data['include'][i]['base_image'] - del data['include'][i]['base_image'] - data['include'][i]['distro'] = ':'.join([data['include'][i]['distro'], str(data['include'][i]['version'])]) - del data['include'][i]['version'] - matrix = json.dumps(data, sort_keys=True) + entries.append(data['include'][i]) + entries[i]['artifact_key'] = entries[i]['distro'] + str(entries[i]['version']).replace('.', '') + if 'packages' in entries[i]: + del entries[i]['packages'] + if 'base_image' in entries[i]: + entries[i]['distro'] = entries[i]['base_image'] + del entries[i]['base_image'] + entries[i]['distro'] = ':'.join([entries[i]['distro'], str(entries[i]['version'])]) + del entries[i]['version'] + + entries.sort(key=lambda k: (k['distro'], k['version'])) + matrix = json.dumps({include: entries}, sort_keys=True) print('Generated Matrix: ' + matrix) print('::set-output name=matrix::' + matrix) - name: Failure Notification From 50f830cc3e73bf503842be8b3458adef8eb17319 Mon Sep 17 00:00:00 2001 From: "Austin S. Hemmelgarn" Date: Wed, 29 Jun 2022 03:49:48 -0400 Subject: [PATCH 2/3] Fix build matrix sorting. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 115406b54a8872..b8b80dc5b0bdd0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -189,7 +189,7 @@ jobs: entries[i]['distro'] = ':'.join([entries[i]['distro'], str(entries[i]['version'])]) del entries[i]['version'] - entries.sort(key=lambda k: (k['distro'], k['version'])) + entries.sort(key=lambda k: k['distro']) matrix = json.dumps({include: entries}, sort_keys=True) print('Generated Matrix: ' + matrix) print('::set-output name=matrix::' + matrix) From 5ddfb81933c73d9054d9926ce10d166c8dd1492e Mon Sep 17 00:00:00 2001 From: "Austin S. Hemmelgarn" Date: Wed, 29 Jun 2022 03:57:01 -0400 Subject: [PATCH 3/3] Fix further typos. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b8b80dc5b0bdd0..c2f8505cff6718 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -190,7 +190,7 @@ jobs: del entries[i]['version'] entries.sort(key=lambda k: k['distro']) - matrix = json.dumps({include: entries}, sort_keys=True) + matrix = json.dumps({'include': entries}, sort_keys=True) print('Generated Matrix: ' + matrix) print('::set-output name=matrix::' + matrix) - name: Failure Notification