1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

chore(CI): Replace CentOS 8 CI with AlmaLinux

CentOS is EOL, and AlmaLinux seems like the closest successor
This commit is contained in:
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"
with:
docker_image_name: debian_old
build-centos-docker:
name: Build centos docker image
build-almalinux-docker:
name: Build almalinux docker image
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ./.github/actions/build-docker-image
name: "Build docker image"
with:
docker_image_name: centos
docker_image_name: almalinux
build-fedora-docker:
name: Build fedora docker image
runs-on: ubuntu-latest
@ -90,10 +90,10 @@ jobs:
name: "Build docker image"
with:
docker_image_name: windows_builder.i686
build-centos:
name: Centos
build-almalinux:
name: Almalinux
runs-on: ubuntu-latest
needs: build-centos-docker
needs: build-almalinux-docker
strategy:
matrix:
features: [full, minimal]
@ -103,9 +103,9 @@ jobs:
- uses: ./.github/actions/load-docker-image
name: Load docker image
with:
docker_image_name: centos
docker_image_name: almalinux
- 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:
name: Fedora
runs-on: ubuntu-latest

View File

@ -13,12 +13,12 @@
# You should have received a copy of the GNU General Public License
# 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 && \
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 --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 \
cmake \
make \

View File

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