chore(CI): Replace CentOS 8 CI with AlmaLinux

CentOS is EOL, and AlmaLinux seems like the closest successor
reviewable/pr6445/r1
Anthony Bilinski 2022-02-08 00:26:06 -08:00
parent 65c42ebd9e
commit 90484a1fdf
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
3 changed files with 13 additions and 13 deletions

View File

@ -45,15 +45,15 @@ jobs:
name: "Build docker image" name: "Build docker image"
with: with:
docker_image_name: debian_old docker_image_name: debian_old
build-centos-docker: build-almalinux-docker:
name: Build centos docker image name: Build almalinux docker image
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: ./.github/actions/build-docker-image - uses: ./.github/actions/build-docker-image
name: "Build docker image" name: "Build docker image"
with: with:
docker_image_name: centos docker_image_name: almalinux
build-fedora-docker: build-fedora-docker:
name: Build fedora docker image name: Build fedora docker image
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -90,10 +90,10 @@ jobs:
name: "Build docker image" name: "Build docker image"
with: with:
docker_image_name: windows_builder.i686 docker_image_name: windows_builder.i686
build-centos: build-almalinux:
name: Centos name: Almalinux
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: build-centos-docker needs: build-almalinux-docker
strategy: strategy:
matrix: matrix:
features: [full, minimal] features: [full, minimal]
@ -103,9 +103,9 @@ jobs:
- uses: ./.github/actions/load-docker-image - uses: ./.github/actions/load-docker-image
name: Load docker image name: Load docker image
with: with:
docker_image_name: centos docker_image_name: almalinux
- name: Run build - name: Run build
run: docker compose run --rm centos ./.travis/build-qtox-linux.sh --build-type ${{ matrix.build_type }} --${{ matrix.features }} run: docker compose run --rm almalinux ./.travis/build-qtox-linux.sh --build-type ${{ matrix.build_type }} --${{ matrix.features }}
build-fedora: build-fedora:
name: Fedora name: Fedora
runs-on: ubuntu-latest runs-on: ubuntu-latest

View File

@ -13,12 +13,12 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
FROM centos:latest FROM almalinux:latest
RUN dnf --nodocs -y install dnf-plugins-core && \ RUN dnf --nodocs -y install dnf-plugins-core && \
dnf config-manager --set-enabled powertools && \ dnf config-manager --set-enabled powertools && \
dnf --nodocs -y install https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-$(rpm -E %almalinux).noarch.rpm && \
dnf --nodocs -y install epel-release && \ dnf --nodocs -y install epel-release && \
dnf --nodocs -y install --nogpgcheck https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm https://mirrors.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-8.noarch.rpm && \
dnf --nodocs -y install \ dnf --nodocs -y install \
cmake \ cmake \
make \ make \

View File

@ -55,11 +55,11 @@ services:
context: ./buildscripts context: ./buildscripts
dockerfile: docker/Dockerfile.flatpak_builder dockerfile: docker/Dockerfile.flatpak_builder
<<: *shared_params <<: *shared_params
centos: almalinux:
image: qtox_centos:latest image: qtox_almalinux:latest
build: build:
context: ./buildscripts context: ./buildscripts
dockerfile: docker/Dockerfile.centos dockerfile: docker/Dockerfile.almalinux
<<: *shared_params <<: *shared_params
fedora: fedora:
image: qtox_fedora:latest image: qtox_fedora:latest