diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2021-03-22 07:12:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-22 07:12:59 -0400 |
| commit | ff29e685f3e3a3e9f897561437585bdbb6d687ba (patch) | |
| tree | fc16e4039a322b4650e7004371bd0bd3a0cbbac1 /.github | |
| parent | 32344ec967caa60cf1bac7dad1c8baf4a471babc (diff) | |
Added Ubuntu 21.04 and Fedora 34 to our CI checks and binary package builds. (#10791)
* Add Ubuntu 21.04 and Fedora 34 to our CI checks.
* Add Fedora 34 and Ubuntu 21.04 package builds as well.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build-and-install.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/packaging.yml | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/.github/workflows/build-and-install.yml b/.github/workflows/build-and-install.yml index c8b0c13697..4c46936013 100644 --- a/.github/workflows/build-and-install.yml +++ b/.github/workflows/build-and-install.yml @@ -36,10 +36,12 @@ jobs: - 'clearlinux:latest' - 'debian:10' - 'debian:9' + - 'fedora:34' - 'fedora:33' - 'fedora:32' - 'opensuse/leap:15.2' - 'opensuse/tumbleweed:latest' + - 'ubuntu:21.04' - 'ubuntu:20.10' - 'ubuntu:20.04' - 'ubuntu:18.04' @@ -74,6 +76,8 @@ jobs: pre: 'apt-get update' rmjsonc: 'apt-get remove -y libjson-c-dev' + - distro: 'fedora:34' + rmjsonc: 'dnf remove -y json-c-devel' - distro: 'fedora:33' rmjsonc: 'dnf remove -y json-c-devel' - distro: 'fedora:32' @@ -84,6 +88,9 @@ jobs: - distro: 'opensuse/tumbleweed:latest' rmjsonc: 'zypper rm -y libjson-c-devel' + - distro: 'ubuntu:21.04' + pre: 'apt-get update' + rmjsonc: 'apt-get remove -y libjson-c-dev' - distro: 'ubuntu:20.10' pre: 'apt-get update' rmjsonc: 'apt-get remove -y libjson-c-dev' diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 2920246fd3..6eb327af12 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -34,10 +34,12 @@ jobs: - {distro: ubuntu, version: "18.04", pkgclouddistro: Ubuntu, pkgcloudversion: "18.04", format: deb, base_image: ubuntu, platform: linux/i386, arch: i386} - {distro: ubuntu, version: "20.04", pkgclouddistro: Ubuntu, pkgcloudversion: "20.04", format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64} - {distro: ubuntu, version: "20.10", pkgclouddistro: Ubuntu, pkgcloudversion: "20.10", format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64} + - {distro: ubuntu, version: "21.04", pkgclouddistro: Ubuntu, pkgcloudversion: "20.10", format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64} - {distro: centos, version: "7", pkgclouddistro: Enterprise Linux, pkgcloudversion: "7.0", format: rpm, base_image: centos, platform: linux/amd64, arch: amd64} - {distro: centos, version: "8", pkgclouddistro: Enterprise Linux, pkgcloudversion: "8.0", format: rpm, base_image: centos, platform: linux/amd64, arch: amd64} - {distro: fedora, version: "32", pkgclouddistro: Fedora, pkgcloudversion: "32.0", format: rpm, base_image: fedora, platform: linux/amd64, arch: amd64} - {distro: fedora, version: "33", pkgclouddistro: Fedora, pkgcloudversion: "33.0", format: rpm, base_image: fedora, platform: linux/amd64, arch: amd64} + - {distro: fedora, version: "34", pkgclouddistro: Fedora, pkgcloudversion: "33.0", format: rpm, base_image: fedora, platform: linux/amd64, arch: amd64} - {distro: opensuse, version: "15.2", pkgclouddistro: openSUSE, pkgcloudversion: "15.2", format: rpm, base_image: opensuse/leap, platform: linux/amd64, arch: amd64} # We intentiaonally disable the fail-fast behavior so that a # build failure for one version doesn't prevent us from publishing |