diff options
Diffstat (limited to '.github')
| -rw-r--r-- | .github/data/build-matrix.json | 4 | ||||
| -rwxr-xr-x | .github/scripts/pkg-test.sh | 2 | ||||
| -rw-r--r-- | .github/workflows/packaging.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/repoconfig-packages.yml | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/.github/data/build-matrix.json b/.github/data/build-matrix.json index c50ec0d228..6ceb9fa541 100644 --- a/.github/data/build-matrix.json +++ b/.github/data/build-matrix.json @@ -34,8 +34,8 @@ "artifact_key": "centos7" }, { - "distro": "centos:8", - "artifact_key": "centos8", + "distro": "rockylinux/rockylinux:8", + "artifact_key": "rockylinux8", "rmjsonc": "dnf remove -y json-c-devel" }, { diff --git a/.github/scripts/pkg-test.sh b/.github/scripts/pkg-test.sh index 196fefa999..148ecd6297 100755 --- a/.github/scripts/pkg-test.sh +++ b/.github/scripts/pkg-test.sh @@ -101,7 +101,7 @@ case "${DISTRO}" in fedora | oraclelinux) install_fedora_like ;; - centos) + centos | rockylinux) install_centos ;; opensuse) diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index ca48f6ca26..38a78731bc 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -52,8 +52,8 @@ jobs: - {distro: ubuntu, version: "21.10", pkgclouddistro: ubuntu/impish, format: deb, base_image: ubuntu, platform: linux/arm/v7, arch: armhf} - {distro: ubuntu, version: "21.10", pkgclouddistro: ubuntu/impish, format: deb, base_image: ubuntu, platform: linux/arm64/v8, arch: arm64} - {distro: centos, version: "7", pkgclouddistro: el/7, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64} - - {distro: centos, version: "8", pkgclouddistro: el/8, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64} - - {distro: centos, version: "8", pkgclouddistro: el/8, format: rpm, base_image: centos, platform: linux/arm64/v8, arch: arm64} + - {distro: rockylinux, version: "8", pkgclouddistro: el/8, format: rpm, base_image: rockylinux/rockylinux, platform: linux/amd64, arch: amd64} + - {distro: rockylinux, version: "8", pkgclouddistro: el/8, format: rpm, base_image: rockylinux/rockylinux, platform: linux/arm64/v8, arch: arm64} - {distro: fedora, version: "34", pkgclouddistro: fedora/34, format: rpm, base_image: fedora, platform: linux/amd64, arch: amd64} - {distro: fedora, version: "34", pkgclouddistro: fedora/34, format: rpm, base_image: fedora, platform: linux/arm/v7, arch: armhf} - {distro: fedora, version: "34", pkgclouddistro: fedora/34, format: rpm, base_image: fedora, platform: linux/arm64/v8, arch: arm64} diff --git a/.github/workflows/repoconfig-packages.yml b/.github/workflows/repoconfig-packages.yml index e5fee2f8a7..665d46d684 100644 --- a/.github/workflows/repoconfig-packages.yml +++ b/.github/workflows/repoconfig-packages.yml @@ -23,7 +23,7 @@ jobs: - {distro: ubuntu, version: "20.04", pkgclouddistro: ubuntu/focal, format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64} - {distro: ubuntu, version: "21.10", pkgclouddistro: ubuntu/impish, format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64} - {distro: centos, version: "7", pkgclouddistro: el/7, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64} - - {distro: centos, version: "8", pkgclouddistro: el/8, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64} + - {distro: rockylinux, version: "8", pkgclouddistro: el/8, format: rpm, base_image: rockylinux/rockylinux, platform: linux/amd64, arch: amd64} - {distro: fedora, version: "34", pkgclouddistro: fedora/34, format: rpm, base_image: fedora, platform: linux/amd64, arch: amd64} - {distro: fedora, version: "35", pkgclouddistro: fedora/35, format: rpm, base_image: fedora, platform: linux/amd64, arch: amd64} - {distro: opensuse, version: "15.3", pkgclouddistro: opensuse/15.3, format: rpm, base_image: opensuse/leap, platform: linux/amd64, arch: amd64} |