From 00badb900ba43879f005e78b789ab47fbfa48df2 Mon Sep 17 00:00:00 2001 From: Jacob Bandes-Storch Date: Thu, 12 Dec 2024 12:48:16 -0800 Subject: [PATCH] Fix CI errors due to ubuntu 24.04 image rollout (#1290) ### 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 (https://github.com/actions/runner-images/issues/10636). It also causes an error with the `setup-swift` action (https://github.com/swift-actions/setup-swift/issues/677). ~Our `setup.cfg` declares `python_requires = >=3.7`, however we were using 3.8 in most CI jobs (https://github.com/foxglove/mcap/pull/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 --- .github/workflows/ci.yml | 12 ++++++------ .github/workflows/website.yml | 4 ++-- .../McapRecordingDemo/McapRecordingDemo.tsx | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92fca88e5c..8476a2b2d0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: @@ -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 @@ -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: @@ -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 @@ -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 @@ -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: diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index 97e4043abb..93102ad415 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -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 @@ -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 diff --git a/website/src/components/McapRecordingDemo/McapRecordingDemo.tsx b/website/src/components/McapRecordingDemo/McapRecordingDemo.tsx index dc65a05cf1..d677caa432 100644 --- a/website/src/components/McapRecordingDemo/McapRecordingDemo.tsx +++ b/website/src/components/McapRecordingDemo/McapRecordingDemo.tsx @@ -273,6 +273,7 @@ export function McapRecordingDemo(): JSX.Element { enableCamera, recordH264, recordH265, + recordVP9, recordAV1, recording, videoStarted,