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.

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

Bump msrv-compatible dependencies #3407

Merged
merged 4 commits into from
Dec 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
39 changes: 5 additions & 34 deletions .github/workflows/rav1e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

jobs:
rustfmt-clippy:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4
Expand All @@ -30,7 +30,7 @@ jobs:
args: -- -D warnings

msrv:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

env:
CARGO_INCREMENTAL: 0
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
--no-default-features

wasi:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: [rustfmt-clippy, msrv]

env:
Expand Down Expand Up @@ -124,8 +124,6 @@ jobs:
toolchain: stable
- conf: dav1d-tests
toolchain: stable
- conf: dav1d-tests-arm64
toolchain: stable
- conf: no-asm-tests
toolchain: stable
- conf: grcov-codecov
Expand All @@ -152,7 +150,7 @@ jobs:
SCCACHE_DIR: /home/runner/.cache/sccache
SCCACHE_IDLE_TIMEOUT: 0

runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: [rustfmt-clippy, msrv]

steps:
Expand All @@ -173,12 +171,9 @@ jobs:
mv -f $SCCACHE_FILE/sccache $HOME/.local/bin/sccache
echo "$HOME/.local/bin" >> $GITHUB_PATH
- name: Install dependencies
if: matrix.conf != 'dav1d-tests-arm64'
run: |
sudo sed -i 's/jammy/lunar/g' /etc/apt/sources.list
sudo rm /etc/apt/sources.list.d/*.list
sudo apt update
sudo apt install nasm libaom-dev meson ninja-build nasm
sudo apt install nasm libaom-dev meson ninja-build
- name: Install cargo-c
if: matrix.conf == 'cargo-c'
env:
Expand All @@ -204,19 +199,6 @@ jobs:
if: matrix.conf == 'grcov-codecov'
run: |
rustup component add llvm-tools-preview
- name: Install aarch64 toolchain, qemu-user and libdav1d deps
if: matrix.conf == 'dav1d-tests-arm64'
env:
LINK: http://ports.ubuntu.com/ubuntu-ports/pool
run: |
rustup target add aarch64-unknown-linux-gnu
{ echo 'deb [arch=amd64] http://azure.archive.ubuntu.com/ubuntu lunar main universe'
echo 'deb [arch=amd64] http://azure.archive.ubuntu.com/ubuntu lunar-updates main universe'
echo 'deb [arch=arm64] http://azure.ports.ubuntu.com/ lunar main universe'
} | sudo tee /etc/apt/sources.list
sudo dpkg --add-architecture arm64
sudo apt update
sudo apt install qemu-user gcc-aarch64-linux-gnu meson ninja-build nasm
- name: Generate Cargo.version for cache key
run: |
cargo --version > Cargo.version
Expand Down Expand Up @@ -256,17 +238,6 @@ jobs:
cargo test --workspace --verbose --release \
--features=decode_test_dav1d \
--color=always -- --color=always --ignored
- name: Run dav1d tests (arm64)
if: matrix.conf == 'dav1d-tests-arm64'
env:
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER: qemu-aarch64 -L /usr/aarch64-linux-gnu
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS: -Clinker=aarch64-linux-gnu-gcc
PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
PKG_CONFIG_SYSROOT_DIR: /
run: |
cargo test --lib --verbose --release --target=aarch64-unknown-linux-gnu \
--no-default-features --features=asm,decode_test_dav1d -- \
--include-ignored
- name: Run build
if: matrix.conf == 'beta-build'
run: |
Expand Down
Loading