diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2023-02-15 07:18:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-15 07:18:30 -0500 |
| commit | 568cda1978cabe8a338c118682a85c56720d5698 (patch) | |
| tree | 263940be2efba3c227a5931c0b2bb6c498c94cd2 /.github/scripts | |
| parent | 3c4676c9bab20c79db0cd444a17898ff9722c2ec (diff) | |
Add Debian 12 to our CI and platform support document. (#14529)
* Fix handling of base images for CI jobs.
This allows us to continue using properly descriptive names despite
Debian not publishing docker images with version numbers.
* Add Debian 12 to CI and platform support documentation.
* Fix build matrix generation scripts.
Diffstat (limited to '.github/scripts')
| -rwxr-xr-x | .github/scripts/gen-matrix-build.py | 2 | ||||
| -rwxr-xr-x | .github/scripts/gen-matrix-packaging.py | 2 | ||||
| -rwxr-xr-x | .github/scripts/gen-matrix-repoconfig.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.github/scripts/gen-matrix-build.py b/.github/scripts/gen-matrix-build.py index 28406470ff..3185e88361 100755 --- a/.github/scripts/gen-matrix-build.py +++ b/.github/scripts/gen-matrix-build.py @@ -17,7 +17,7 @@ for i, v in enumerate(data['include']): } if 'base_image' in v: - e['distro'] = ':'.join([v['base_image'], str(v['version'])]) + e['distro'] = v['base_image'] else: e['distro'] = ':'.join([v['distro'], str(v['version'])]) diff --git a/.github/scripts/gen-matrix-packaging.py b/.github/scripts/gen-matrix-packaging.py index 01e9ec7909..9347cd7674 100755 --- a/.github/scripts/gen-matrix-packaging.py +++ b/.github/scripts/gen-matrix-packaging.py @@ -26,7 +26,7 @@ for i, v in enumerate(data['include']): 'version': data['include'][i]['version'], 'repo_distro': 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'], + 'base_image': data['include'][i]['base_image'] if 'base_image' in data['include'][i] else ':'.join([data['include'][i]['distro'], data['include'][i]['version']]), 'platform': data['platform_map'][arch], 'arch': arch }) diff --git a/.github/scripts/gen-matrix-repoconfig.py b/.github/scripts/gen-matrix-repoconfig.py index 46f671697d..264cd53e76 100755 --- a/.github/scripts/gen-matrix-repoconfig.py +++ b/.github/scripts/gen-matrix-repoconfig.py @@ -17,7 +17,7 @@ for i, v in enumerate(data['include']): 'version': data['include'][i]['version'], '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'], + 'base_image': data['include'][i]['base_image'] if 'base_image' in data['include'][i] else ':'.join([data['include'][i]['distro'], data['include'][i]['version']]), 'platform': data['platform_map']['amd64'], 'arches': ' '.join(['"' + x + '"' for x in data['include'][i]['packages']['arches']]) }) |