Skip to content

Commit

Permalink
Fix CI errors due to ubuntu 24.04 image rollout (#1290)
Browse files Browse the repository at this point in the history
### Changelog
None

### Docs

None

### Description

CI [broke
recently](https://github.com/foxglove/mcap/actions/runs/12302494967)
because (I think) `ubuntu-latest` changed to `ubuntu-24.04`. The 24.04
image no longer has python 3.7/3.8
(actions/runner-images#10636). It also causes
an error with the `setup-swift` action
(swift-actions/setup-swift#677).

~Our `setup.cfg` declares `python_requires = >=3.7`, however we were
using 3.8 in most CI jobs (#988). I
downgraded these from 3.8 to 3.7 here.~ It was hard to get this working
so I left it at 3.8.

- Included a drive-by lint fix
  • Loading branch information
jtbandes authored Dec 12, 2024
1 parent 5db8c69 commit 00badb9
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
- run: yarn test:conformance --runner go-

conformance-python:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04 # required for python 3.8
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -90,7 +90,7 @@ jobs:
cache: yarn
- uses: actions/setup-python@v5
with:
python-version: 3.7
python-version: 3.8
- run: cd python && pip install -e mcap
- run: yarn install --immutable
- run: yarn test:conformance:generate-inputs --verify
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
- run: yarn test:conformance --runner ksy-

conformance-swift:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04 # https://github.com/swift-actions/setup-swift/issues/677
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -200,7 +200,7 @@ jobs:
key: ${{ runner.os }}-${{ hashFiles('cpp/**/conanfile.py') }}
- uses: actions/setup-python@v5
with:
python-version: 3.7
python-version: 3.8
- run: pip install conan~=1.0
- run: bash build.sh --build-tests-only
- run: ./test/build/Debug/bin/unit-tests
Expand Down Expand Up @@ -293,7 +293,7 @@ jobs:
- run: yarn workspace @foxglove/mcap-example-text-annotation-demo typecheck

python:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04 # required for python 3.8
defaults:
run:
working-directory: python
Expand Down Expand Up @@ -464,7 +464,7 @@ jobs:
draft: false

swift:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04 # https://github.com/swift-actions/setup-swift/issues/677
steps:
- uses: actions/checkout@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
retention-days: 1

docs-python:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04 # required for python 3.8
steps:
- uses: actions/checkout@v4

Expand All @@ -71,7 +71,7 @@ jobs:
retention-days: 1

docs-swift:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04 # https://github.com/swift-actions/setup-swift/issues/677
steps:
- uses: actions/checkout@v4

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ export function McapRecordingDemo(): JSX.Element {
enableCamera,
recordH264,
recordH265,
recordVP9,
recordAV1,
recording,
videoStarted,
Expand Down

0 comments on commit 00badb9

Please sign in to comment.