Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CI (#8) #129

Merged
merged 7 commits into from
Jan 17, 2024
Merged

Update CI (#8) #129

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4b46381
Update CI (#8)
hdholm May 7, 2023
a70aa9c
Update actions.checkout to v3
hdholm May 7, 2023
51d13bd
Remove extraneous spaces
hdholm May 9, 2023
f55d2b6
Merge branch 'master' into UpdateCI
hdholm May 9, 2023
b9a7914
Clean up this messed up pull. CentOS Stream 9 seems to work with cla…
hdholm May 20, 2023
195e555
Add optional dependencies to ensure everything possible builds. And a…
hdholm May 29, 2023
dfe2ec2
Merge branch 'latchset:master' into UpdateCI
hdholm Jan 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,19 @@ jobs:
os:
- fedora:latest
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this removal necessary?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's in the commit message. CentOS 7 and Stream 9 got moved out of the first block (which uses both clang and gcc) and into the block below configured simply for gcc. clang wasn't getting installed correctly on either CentOS 7 nor Stream 9 and although it's probably some rpm/dnf magic I'm overlooking I couldn't figure it out after a little looking so it seemed better to (for the moment at least) just drop the clang compiles to get the CI tests running and hopefully someone can figure out what needs to happen to get clang happy on those two OSs.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello. Thanks for clarifying. I will open an Issue then to track the clang on CentOS Stream 9 issue.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why clang in Stream 9 was failing (possibly getting wrong install dependencies section) but it works now with the cleaned up version I just pushed. Only CentOS 7 seems to fail with clang and that's because clang is in the SCL in CentOS 7 and would require changes to the build to run the compiler with the SCL command. Since it's clearly never worked before and the gcc build works fine and CentOS 7 is approaching EOL, it doesn't seem worth the work to make the changes necessary for clang rather than just live with gcc there.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @hdholm. Thanks for the PR. I agree it is not that important to have clang compilation in CentOS7 right now.
In my opinion, this can be merged.

Let's wait a little bit for @sergio-correia to have a view on it and we will merge it before creating the new release.

- debian:testing
- debian:latest
- ubuntu:rolling
- ubuntu:jammy
- ubuntu:focal
stable:: [true]
include:
- compiler: gcc
os: quay.io/centos/centos:stream9
stable: true
- compiler: gcc
os: centos:7
stable: true
- compiler: gcc
os: fedora:rawhide
stable: false
Expand All @@ -34,7 +41,7 @@ jobs:
os: ubuntu:devel
stable: false
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Show OS information
run: |
Expand Down Expand Up @@ -81,7 +88,7 @@ jobs:
- gcc
- clang
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Show OS information
run: |
Expand Down
17 changes: 14 additions & 3 deletions .github/workflows/install-dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,21 @@ fedora:*)
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-config-manager -y --enable crb \
|| yum-config-manager -y --enable powertools || :
yum -y install ${COMMON}
yum-builddep -y jose
;;

*centos:stream*)
dnf -y clean all
dnf -y --setopt=deltarpm=0 update
dnf install -y dnf-plugins-core epel-release
dnf config-manager -y --set-enabled powertools \
|| dnf config-manager -y --set-enabled crb || :
dnf -y install --allowerasing ${COMMON}
dnf builddep -y jose
;;

esac
# vim: set ts=8 shiftwidth=4 softtabstop=4 expandtab smarttab colorcolumn=80: