diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index a3b37ce..e277843 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -58,6 +58,10 @@ jobs: CYLC_VERSION=8 rose version && \ fcm version && \ svn --version && \ - gfortran --version | grep 4.8.5 || fcm test-battery t/fcm-make && \ - fcm test-battery t/fcm-conflicts && \ + fcm test-battery t/fcm-make && \ which at" + + - name: Test fcm conflicts + run: | + export VAGRANT_VAGRANTFILE=Vagrantfile.${{ matrix.os }} + vagrant ssh -c "fcm test-battery t/fcm-conflicts" diff --git a/install.sh b/install.sh index ed6f109..3fdad55 100755 --- a/install.sh +++ b/install.sh @@ -20,6 +20,8 @@ if [[ $collections =~ desktop ]]; then fi if [[ $dist == redhat && $release == centos* ]]; then + # Stream 8 now EOL + sed -i -e "s|mirrorlist=|#mirrorlist=|g" -e "s|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g" /etc/yum.repos.d/CentOS-* # Add the EPEL repository yum install -y epel-release || error fi