Skip to content

Commit

Permalink
GHA: Remove centos when testing depexts as the docker images no longe…
Browse files Browse the repository at this point in the history
…r work

They also have been officially deprecated.
  • Loading branch information
kit-ty-kate committed Jul 2, 2024
1 parent c12b9d0 commit a715eba
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 30 deletions.
14 changes: 2 additions & 12 deletions .github/scripts/depexts/generate-actions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -eu

#for target in alpine archlinux centos debian fedora gentoo opensuse oraclelinux ubuntu; do
#for target in alpine archlinux debian fedora gentoo opensuse oraclelinux ubuntu; do
target=$1
dir=.github/actions/$target

Expand Down Expand Up @@ -36,15 +36,6 @@ EOF
cat >$dir/Dockerfile << EOF
FROM archlinux
RUN pacman -Syu --noconfirm $mainlibs $ocaml gcc diffutils
EOF
;;
centos)
# CentOS 7 doesn't support OCaml 5 (GCC is too old)
OCAML_CONSTRAINT=' & < "5.0"'
cat >$dir/Dockerfile << EOF
FROM centos:7
RUN yum install -y $mainlibs $ocaml
RUN yum install -y gcc-c++
EOF
;;
debian)
Expand Down Expand Up @@ -160,8 +151,7 @@ test_depext () {

test_depext conf-gmp conf-which conf-autoconf

# disable automake for centos, as os-family returns rhel
if [ $target != "centos" ] && [ $target != "opensuse" ]; then
if [ $target != "opensuse" ]; then
test_depext conf-automake
fi

Expand Down
18 changes: 0 additions & 18 deletions .github/workflows/depexts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,24 +74,6 @@ jobs:
uses: ./.github/actions/archlinux
id: depexts-archlinux

depexts-centos:
needs: opam-cache
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: opam binary cache
uses: actions/cache@v3
with:
path: binary/opam
key: binary-${{ env.OPAMVERSION }}
- name: generate action
run: |
bash .github/scripts/depexts/generate-actions.sh centos
- name: depexts actions centos
uses: ./.github/actions/centos
id: depexts-centos

depexts-debian:
needs: opam-cache
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions master_changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ users)
### Engine

## Github Actions
* Remove centos when testing depexts as the docker images no longer work [#6063 @kit-ty-kate]

## Doc

Expand Down

0 comments on commit a715eba

Please sign in to comment.