Skip to content

Commit

Permalink
Bump Ubuntu to 24.04 (#2165)
Browse files Browse the repository at this point in the history
Bump gcc version to 14
Install the imagemagick, libjpeg-turbu8-dev, and libpng-dev packages
  • Loading branch information
vrabaud authored May 23, 2024
1 parent 3124f6b commit c21943e
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 28 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/ci-disable-gtest.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This is a copy of ci-unix-static.yml with gtest disabled. It differs from ci-unix-static.yml as follows:
#
# * The os matrix consists of ubuntu-latest only.
# * The os matrix consists of ubuntu-24.04 only.
# * Does not build libgav1. (Building libgav1 would enable CXX in CMakeLists.txt.)
# * Disables gtest.

Expand Down Expand Up @@ -28,11 +28,11 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
os: [ubuntu-24.04]
include:
- runs-on: ubuntu-latest
- runs-on: ubuntu-24.04
compiler: gcc
gcc: 12
gcc: 14

steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
Expand All @@ -47,7 +47,10 @@ jobs:
profile: minimal
toolchain: stable
override: true

- name: Install dependencies
run: |
sudo apt update
sudo apt install imagemagick libjpeg-turbo8-dev libpng-dev
- name: Install cargo-c
env:
LINK: https://github.com/lu-zero/cargo-c/releases/latest/download
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/ci-linux-golden-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
os: [ubuntu-24.04]
include:
- runs-on: ubuntu-latest
- runs-on: ubuntu-24.04
compiler: gcc
gcc: 12
gcc: 14

steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
Expand All @@ -32,6 +32,10 @@ jobs:
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
with:
python-version: '3.x'
- name: Install dependencies
run: |
sudo apt update
sudo apt install imagemagick libjpeg-turbo8-dev libpng-dev
- name: Cache external dependencies
id: cache-ext
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/ci-linux-static-old-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
os: [ubuntu-24.04]
include:
- runs-on: ubuntu-latest
- runs-on: ubuntu-24.04
compiler: gcc
gcc: 12
gcc: 14

steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
Expand All @@ -40,6 +40,10 @@ jobs:
profile: minimal
toolchain: stable
override: true
- name: Install dependencies (Linux)
run: |
sudo apt update
sudo apt install imagemagick libjpeg-turbo8-dev libpng-dev
- name: Install cargo-c (linux)
env:
LINK: https://github.com/lu-zero/cargo-c/releases/latest/download
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci-unix-shared-installed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-24.04, macos-latest]
include:
- runs-on: ubuntu-latest
- runs-on: ubuntu-24.04
compiler: gcc
gcc: 12
gcc: 14

steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
Expand Down Expand Up @@ -51,8 +51,8 @@ jobs:
if: runner.os == 'Linux'
run: |
echo "deb http://azure.archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
sudo apt-get update
sudo apt-get install libaom-dev libdav1d-dev libyuv-dev imagemagick
sudo apt update
sudo apt install imagemagick libaom-dev libdav1d-dev libjpeg-turbo8-dev libpng-dev libyuv-dev
- name: Install dependencies (macOS)
if: runner.os == 'macOS'
run: brew install aom dav1d imagemagick
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/ci-unix-shared-local.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This is a copy of ci-unix-static.yml for building shared libraries. It differs from ci-unix-static.yml as follows:
#
# * The os matrix consists of ubuntu-latest only.
# * The os matrix consists of ubuntu-24.04 only.
# * Does not build rav1e, SVT-AV1 nor libgav1.

name: CI Unix Shared Local
Expand All @@ -20,12 +20,12 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-13]
os: [ubuntu-24.04, macos-13]
libyuv: [OFF, LOCAL]
include:
- runs-on: ubuntu-latest
- runs-on: ubuntu-24.04
compiler: gcc
gcc: 12
gcc: 14

name: build-shared-local (${{ matrix.os }}, libyuv ${{ matrix.libyuv }})

Expand All @@ -37,6 +37,11 @@ jobs:
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
with:
python-version: '3.x'
- name: Install dependencies (Linux)
if: runner.os == 'Linux'
run: |
sudo apt update
sudo apt install imagemagick libjpeg-turbo8-dev libpng-dev
- name: Install dependencies (macOS)
if: runner.os == 'macOS'
run: brew install imagemagick
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/ci-unix-static-av2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ concurrency:

jobs:
build-static-av2:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
also-enable-av1-codecs: [OFF, LOCAL] # On top of enabling AV2 codecs.
include:
- runs-on: ubuntu-latest
- runs-on: ubuntu-24.04
compiler: gcc
gcc: 12
gcc: 14

steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
Expand All @@ -41,6 +41,10 @@ jobs:
profile: minimal
toolchain: stable
override: true
- name: Install dependencies
run: |
sudo apt update
sudo apt install imagemagick libjpeg-turbo8-dev libpng-dev
- name: Install cargo-c
env:
LINK: https://github.com/lu-zero/cargo-c/releases/latest/download
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/ci-unix-static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-13]
os: [ubuntu-24.04, macos-13]
build-type: [Release, Debug]
include:
- runs-on: ubuntu-latest
- runs-on: ubuntu-24.04
compiler: gcc
gcc: 12
gcc: 14

steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
Expand All @@ -42,11 +42,16 @@ jobs:
profile: minimal
toolchain: stable
override: true
- name: Install dependencies (Linux)
if: runner.os == 'Linux'
run: |
sudo apt update
sudo apt install imagemagick libjpeg-turbo8-dev libpng-dev
- name: Install dependencies (macOS)
if: runner.os == 'macOS'
run: brew install imagemagick
- name: Install cargo-c (linux)
if: matrix.os == 'ubuntu-latest'
if: runner.os == 'Linux'
env:
LINK: https://github.com/lu-zero/cargo-c/releases/latest/download
CARGO_C_FILE: cargo-c-x86_64-unknown-linux-musl.tar.gz
Expand All @@ -68,7 +73,7 @@ jobs:
path: ext, build/_deps
key: ${{ runner.os }}-${{ matrix.build-type }}-unix-static-${{ hashFiles('cmake/Modules/*', 'ext/*.cmd', 'ext/*.sh') }}
- name: Setup cmake
if: matrix.os == 'ubuntu-latest'
if: runner.os == 'Linux'
uses: jwlawson/actions-setup-cmake@802fa1a2c4e212495c05bf94dba2704a92a472be # v2.0.2
with:
# CMake version 3.18 is required to build libxml2.
Expand Down

0 comments on commit c21943e

Please sign in to comment.