Fix builds and advance Linux runner to ubuntu-20.04#65
Merged
Conversation
nwt
approved these changes
Aug 29, 2022
Member
nwt
left a comment
There was a problem hiding this comment.
No need to do anything about this here, but for future PRs, it's preferable to confine orthogonal changes like these to separate PRs.
This was referenced Aug 29, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
As noted in brimdata/brimcap#259 (comment), while the changes in #64 allowed the build automation to run successfully and produce an artifact, the result actually ended up being broken. Specifically, the Suricata Update binary produced by
pyinstallercomplained of being unable to find a module.I could repro this breakage even with the Ubuntu artifact, and I'd not touched that build automation at all in #64, so this indicated something else had changed on us in the time since we last built.
I hacked at this and found that I could make a working binary if I just rolled back to the version of
pyinstalleras of when we last successfully built. Through further binary searching I found the firstpyinstallerversion that breaks is4.6, so here I've pinned to the version right before that. I don't see anything in their 4.6 changelog entry that sticks out as an explanation for the change, but I'm inclined to go with what works for now and look into making it work with currentpyinstalleras need arises.While I was under the hood, I remembered how GitHub is set to retire some of the older versions of the Actions Runners, so I took a shot at advancing those. For Linux, the move from
ubuntu-18.04toubuntu-20.04only needed a couple of library tweaks, so I've included that here. An attempt to make the macOS move frommacos-10.15tomacos-11was not so simple. In the interest of divide & conquer, rather than get into that here I'd like to merge this PR so I can get working artifacts that include the fix to brimdata/brimcap#259 and then look into the Mac build stuff at a later date.To test, I created a draft Suricata artifact https://github.com/brimdata/build-suricata/releases/tag/v5.0.3-brim3, then pointed at that from a test Brimcap
suricata-v5.0.3-brim3branch that ran successfully through CI here and also a test Brim suricata-v5.0.3-brim3 branch that pointed at that Brimcap commit, and that ran successfully through CI here.