Update ci (#10)

* Update CI (#8) * Update build.yml Update OS and actions/checkout versions * Update install-dependencies Add CentOS Stream dependencies * Update install-dependencies * Update install-dependencies * Update install-dependencies * Update install-dependencies * Update install-dependencies * Update install-dependencies * Update build.yml * Update build.yml * Update actions.checkout to v3 Missed that there was a separate invocation for the osx builds. * Remove extraneous spaces * Clean up this messed up pull. CentOS Stream 9 seems to work with clang and since changes would be needed to deal with clang in SCL for CentOS 7 it's pretty clear that never worked although the gcc build seems fine.
hdholm · May 29, 2023 · ae86b3e · ae86b3e
1 parent 8bbffd9
commit ae86b3e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,11 +14,13 @@ jobs:
           - clang
         os:
           - fedora:latest
-          - quay.io/centos/centos:stream8
           - quay.io/centos/centos:stream9
+          - quay.io/centos/centos:stream8
           - debian:testing
           - debian:latest
           - ubuntu:rolling
+          - ubuntu:jammy
+          - ubuntu:focal
         stable:: [true]
         include:
           - compiler: gcc
@@ -33,8 +35,11 @@ jobs:
           - compiler: clang
             os: ubuntu:devel
             stable: false
+          - compiler: gcc
+            os: centos:7
+            stable: true
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Show OS information
         run: |
@@ -82,7 +87,7 @@ jobs:
           - gcc
           - clang
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Show OS information
         run: |

diff --git a/.github/workflows/install-dependencies b/.github/workflows/install-dependencies
@@ -30,14 +30,22 @@ fedora:*)
     dnf -y install ${COMMON} pkgconfig openssl-devel zlib-devel jansson-devel
     ;;
 
-*centos:*)
+centos:7)
     yum -y clean all
     yum -y --setopt=deltarpm=0 update
-    yum install -y yum-utils epel-release
-    yum config-manager -y --set-enabled crb \
-        || yum config-manager -y --set-enabled powertools || :
-    yum -y --allowerasing install ${COMMON}
+    yum install -y yum-utils epel-release centos-release-scl llvm-toolset-7
+    yum -y install ${COMMON}
     yum-builddep -y jose
     ;;
+
+*centos:stream*)
+    dnf -y clean all
+    dnf -y --allowerasing --setopt=deltarpm=0 update
+    dnf install -y yum-utils epel-release
+    dnf config-manager -y --set-enabled crb \
+        || dnf config-manager -y --set-enabled powertools || :
+    dnf -y --allowerasing install ${COMMON}
+    dnf builddep -y jose
+    ;;
 esac
 # vim: set ts=8 shiftwidth=4 softtabstop=4 expandtab smarttab colorcolumn=80: