[ImgBot] Optimize images

.devcontainer/features/ladybird/install-fedora.sh

@@ -8,3 +8,6 @@ dnf install -y git gh
 dnf install -y autoconf-archive automake ccache cmake curl google-noto-sans-mono-fonts liberation-sans-fonts \
     libglvnd-devel libtool nasm ninja-build patchelf perl-FindBin perl-IPC-Cmd perl-lib qt6-qtbase-devel \
     qt6-qttools-devel qt6-qtwayland-devel tar unzip zip zlib-ng-compat-static
+
+# Install Rust toolchain
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y

.devcontainer/features/ladybird/install-ubuntu.sh

@@ -25,6 +25,10 @@ install_llvm_key() {
 
 apt update -y
 apt install -y lsb-release git python3 autoconf autoconf-archive automake build-essential cmake libdrm-dev libgl1-mesa-dev libtool nasm ninja-build pkg-config qt6-base-dev qt6-tools-dev-tools qt6-wayland ccache fonts-liberation2 zip unzip curl tar
+
+### Install Rust toolchain
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+
 ### Ensure new enough host compiler is available
 
 VERSION="0.0.0"

.github/actions/cache-restore/action.yml

@@ -30,10 +30,6 @@ inputs:
     description: 'Path to the ccache directory'
     required: false
     default: ''
-  download_cache_path:
-    description: 'Path to the download cache directory'
-    required: false
-    default: 'caches'
   vcpkg_cache_path:
     description: 'Path to vcpkg binary cache'
     required: false
@@ -87,13 +83,13 @@ runs:
         CCACHE_DIR: ${{ inputs.ccache_path }}
       run: |
         ccache -M 0
-        
+
         # Reset all ccache modification dates to a known epoch. This provides a baseline that we can prune against.
-        Get-ChildItem -Path "${{ inputs.ccache_path }}" -Recurse | Sort-Object FullName -Descending | ForEach-Object { 
+        Get-ChildItem -Path "${{ inputs.ccache_path }}" -Recurse | Sort-Object FullName -Descending | ForEach-Object {
             $_.LastWriteTime = [DateTime]::Parse("2018-10-10T09:53:07Z")
             $_.LastAccessTime = [DateTime]::Parse("2018-10-10T09:53:07Z")
         }
-        
+
         ccache -s
         ccache -z
 

.github/actions/setup/action.yml

@@ -14,45 +14,123 @@ inputs:
     description: 'Toolchain to set up'
     required: true
     default: 'Clang'
+  gcc_version:
+    description: 'GCC version to install'
+    required: false
+    default: '14'
+  llvm_version:
+    description: 'LLVM version to install'
+    required: false
+    default: '21'
+  type:
+    description: 'Whether the setup is for building or linting'
+    required: false
+    default: 'build'
+
+outputs:
+  gcc_version:
+    description: 'The installed GCC version'
+    value: ${{ steps.export-versions.outputs.gcc_version }}
+  llvm_version:
+    description: 'The installed LLVM version'
+    value: ${{ steps.export-versions.outputs.llvm_version }}
+
 runs:
   using: "composite"
   steps:
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
       with:
         python-version: 3.12
         cache: 'pip'
 
     - name: 'Install Python dependencies'
       shell: bash
-      run: pip install pyyaml requests six
+      run: |
+        python3 -m pip install --upgrade pip
 
-    - name: 'Install Dependencies'
+        if ${{ inputs.type == 'build' }} ; then
+          pip3 install pyyaml requests six
+        else
+          pip3 install ruff
+        fi
+
+    - name: Install apt repositories
       if: ${{ inputs.os == 'Linux' }}
       shell: bash
       run: |
-        set -e
-
         sudo add-apt-repository ppa:ubuntu-toolchain-r/test
 
-        if [ ! -f /etc/apt/sources.list.d/llvm.list ]; then
+        UBUNTU_RELEASE=$(lsb_release -cs)
+
+        LLVM_LIST="/etc/apt/sources.list.d/llvm.list"
+        LLVM_TOOLCHAIN="llvm-toolchain-${UBUNTU_RELEASE}-${{ inputs.llvm_version }}"
+
+        if [ ! -f "${LLVM_LIST}" ] || ! grep -q "${LLVM_TOOLCHAIN}" "${LLVM_LIST}" ; then
           curl -f -o /usr/share/keyrings/llvm-snapshot.gpg.key https://apt.llvm.org/llvm-snapshot.gpg.key
-          echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot.gpg.key] http://apt.llvm.org/noble/ llvm-toolchain-noble-20 main" | sudo tee -a /etc/apt/sources.list.d/llvm.list
+          echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot.gpg.key] http://apt.llvm.org/${UBUNTU_RELEASE}/ ${LLVM_TOOLCHAIN} main" | sudo tee "${LLVM_LIST}"
         fi
 
         sudo apt-get update -y
-        sudo apt-get install -y autoconf autoconf-archive automake build-essential ccache cmake curl fonts-liberation2 \
-            gcc-14 g++-14 libcurl4-openssl-dev libdrm-dev libegl1-mesa-dev libgl1-mesa-dev libpulse-dev libssl-dev \
-            libstdc++-14-dev lld-20 llvm-20 nasm ninja-build qt6-base-dev qt6-tools-dev-tools tar unzip zip
+
+    - name: Install Dependencies
+      if: ${{ inputs.os == 'Linux' && inputs.type == 'build' }}
+      shell: bash
+      run: |
+        sudo apt-get install -y \
+            autoconf \
+            autoconf-archive \
+            automake \
+            build-essential \
+            ccache \
+            cmake \
+            curl \
+            fonts-liberation2 \
+            g++-${{ inputs.gcc_version }} \
+            gcc-${{ inputs.gcc_version }} \
+            libcurl4-openssl-dev \
+            libdrm-dev \
+            libegl1-mesa-dev \
+            libgl1-mesa-dev \
+            libpulse-dev \
+            libssl-dev \
+            libstdc++-${{ inputs.gcc_version }}-dev \
+            lld-${{ inputs.llvm_version }} \
+            llvm-${{ inputs.llvm_version }} \
+            nasm \
+            ninja-build \
+            qt6-base-dev \
+            qt6-tools-dev-tools \
+            tar \
+            unzip \
+            zip
 
         if ${{ inputs.toolchain == 'Clang' }} ; then
-          sudo apt-get install -y clang-20 clang++-20 clang-tools-20
-          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-20 100
-          sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-20 100
+          sudo apt-get install -y \
+              clang-${{ inputs.llvm_version }} \
+              clang++-${{ inputs.llvm_version }} \
+              clang-tools-${{ inputs.llvm_version }}
+
+          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${{ inputs.llvm_version }} 100
+          sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${{ inputs.llvm_version }} 100
         fi
 
-        sudo update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer /usr/bin/llvm-symbolizer-20 100
-        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100
-        sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 100
+        sudo update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer /usr/bin/llvm-symbolizer-${{ inputs.llvm_version }} 100
+        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ inputs.gcc_version }} 100
+        sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${{ inputs.gcc_version }} 100
+
+    - name: Install Dependencies
+      if: ${{ inputs.os == 'Linux' && inputs.type == 'lint' }}
+      shell: bash
+      run: |
+        sudo apt-get install -y \
+            clang-format-${{ inputs.llvm_version }} \
+            generate-ninja \
+            optipng \
+            shellcheck
+
+        sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-${{ inputs.llvm_version }} 100
+
+        sudo npm install -g prettier@3.8.1
 
     - name: Ensure clang-cl is available
       if: ${{ inputs.os == 'Windows' && inputs.toolchain == 'ClangCL' }}
@@ -74,60 +152,33 @@ runs:
       with:
         xcode-version: 26.2
 
-    - name: 'Install Swift toolchain'
-      if: ${{ inputs.toolchain == 'Swift' }}
-      shell: bash
-      run: |
-        set -e
-
-        export SWIFTLY_HOME_DIR=${{ github.workspace }}/.swiftly/share
-        export SWIFTLY_BIN_DIR=${{ github.workspace }}/.swiftly/bin
-
-        echo "$SWIFTLY_BIN_DIR" >> $GITHUB_PATH
-        echo "SWIFTLY_HOME_DIR=$SWIFTLY_HOME_DIR" >> $GITHUB_ENV
-        echo "SWIFTLY_BIN_DIR=$SWIFTLY_BIN_DIR" >> $GITHUB_ENV
-
-        export PATH=$SWIFTLY_BIN_DIR:$PATH
-
-        mkdir -p $SWIFTLY_HOME_DIR
-        mkdir -p $SWIFTLY_BIN_DIR
-
-        if ${{ inputs.os == 'Linux' }} ; then
-          curl -O https://download.swift.org/swiftly/linux/swiftly-${{ inputs.arch }}.tar.gz
-          file swiftly-${{ inputs.arch }}.tar.gz
-          tar -xzf swiftly-${{ inputs.arch }}.tar.gz -C $SWIFTLY_BIN_DIR
-          rm swiftly-${{ inputs.arch }}.tar.gz
-        else
-          # FIXME: https://github.com/swiftlang/swiftly/issues/271
-          #    Why does this drop files in $HOME? That's not very CI-friendly
-          curl -O https://download.swift.org/swiftly/darwin/swiftly.pkg
-          installer -pkg swiftly.pkg -target CurrentUserHomeDirectory
-          cp ~/.swiftly/bin/swiftly $SWIFTLY_BIN_DIR
-          rm swiftly.pkg
-        fi
-
-        swiftly init \
-          --no-modify-profile \
-          --quiet-shell-followup \
-          --assume-yes \
-          --skip-install \
-          --verbose
-
-        echo "swiftly version: $(swiftly --version)" >&2
-
-        # installs version listed in .swift-version
-        swiftly install
-        swiftly list
-
     - name: 'Install Dependencies'
       if: ${{ inputs.os == 'macOS' || inputs.os == 'Android' }}
       shell: bash
       run: |
-        set -e
         brew update
-        brew install autoconf autoconf-archive automake bash ccache coreutils libtool llvm@20 nasm ninja pkg-config qt unzip
+
+        brew install \
+            autoconf \
+            autoconf-archive \
+            automake \
+            bash \
+            ccache \
+            coreutils \
+            libtool \
+            llvm@${{ inputs.llvm_version }} \
+            nasm \
+            ninja \
+            pkg-config \
+            qt \
+            unzip
+
+    - name: 'Install Rust toolchain'
+      if: ${{ inputs.os != 'Windows' }}
+      uses: dtolnay/rust-toolchain@stable
 
     - name: 'Install wasm-tools'
+      if: ${{ inputs.type == 'build' }}
       shell: bash
       run: |
         VERSION=1.243.0
@@ -176,5 +227,13 @@ runs:
           core.exportVariable('VCPKG_FORCE_SYSTEM_BINARIES', '1')
 
     - name: 'Install vcpkg'
+      if: ${{ inputs.type == 'build' }}
       shell: bash
       run: ./Toolchain/BuildVcpkg.py
+
+    - name: 'Export installed versions'
+      id: 'export-versions'
+      shell: bash
+      run: |
+        echo "gcc_version=${{ inputs.gcc_version }}" >> "$GITHUB_OUTPUT"
+        echo "llvm_version=${{ inputs.llvm_version }}" >> "$GITHUB_OUTPUT"

.github/workflows/build.yml

@@ -58,6 +58,19 @@ jobs:
           sudo ln -snf /usr/share/zoneinfo/Etc/UTC /etc/localtime
           echo "Etc/UTC" | sudo tee /etc/timezone
 
+      - name: Pre-clone vcpkg (with retry)
+        run: |
+          VCPKG_REV=$(python3 -c "import json; print(json.load(open('vcpkg.json'))['builtin-baseline'])")
+          VCPKG_DIR="Build/vcpkg"
+          if [ ! -d "$VCPKG_DIR/.git" ]; then
+            for i in 1 2 3 4 5; do
+              git clone https://github.com/microsoft/vcpkg.git "$VCPKG_DIR" && break
+              echo "vcpkg clone attempt $i failed, retrying in 30s..."
+              rm -rf "$VCPKG_DIR"
+              sleep 30
+            done
+          fi
+
       - name: Build Ladybird
         env:
           VCPKG_BINARY_SOURCES: "clear;files,${{ github.workspace }}/.vcpkg_cache,readwrite"
@@ -114,8 +127,12 @@ jobs:
 
       - name: Install dependencies including Clang 19+
         run: |
-          brew update
-          brew install cmake ninja ccache qt python@3.14 pkg-config wabt autoconf autoconf-archive automake libtool
+          brew update || true   # non-fatal: tap HTTP 500s are transient; homebrew/core still updates
+          for i in 1 2 3; do
+            brew install cmake ninja ccache qt python@3.14 pkg-config wabt autoconf autoconf-archive automake libtool && break
+            echo "brew install attempt $i failed, retrying in 15s..."
+            sleep 15
+          done
 
           # Ensure Python 3.14 is properly linked
           brew link --overwrite python@3.14
@@ -192,6 +209,18 @@ jobs:
           which clang-20 || which clang
           echo "Build environment ready"
 
+      - name: Pre-clone vcpkg (with retry)
+        run: |
+          VCPKG_DIR="Build/vcpkg"
+          if [ ! -d "$VCPKG_DIR/.git" ]; then
+            for i in 1 2 3 4 5; do
+              git clone https://github.com/microsoft/vcpkg.git "$VCPKG_DIR" && break
+              echo "vcpkg clone attempt $i failed, retrying in 30s..."
+              rm -rf "$VCPKG_DIR"
+              sleep 30
+            done
+          fi
+
       - name: Build Ladybird (macOS)
         env:
           CMAKE_MAKE_PROGRAM: /opt/homebrew/bin/ninja

.github/workflows/ci.yml

@@ -74,23 +74,3 @@ jobs:
       arch: ${{ matrix.arch }}
       build_preset: ${{ matrix.build_preset }}
       clang_plugins: ${{ matrix.clang_plugins }}
-
-  Flatpak:
-    if: github.repository == 'LadybirdBrowser/ladybird'
-    name: Flatpak ${{ matrix.arch }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: ['x86_64']
-        runner_labels: ['["blacksmith-16vcpu-ubuntu-2404"]']
-
-        include:
-          - arch: 'aarch64'
-            runner_labels: '["blacksmith-16vcpu-ubuntu-2404-arm"]'
-
-    secrets: inherit
-    uses: ./.github/workflows/flatpak-template.yml
-    with:
-      arch: ${{ matrix.arch }}
-      runner_labels: ${{ matrix.runner_labels }}

.github/workflows/flatpak.yml

@@ -0,0 +1,28 @@
+name: Flatpak
+
+on: [push, pull_request]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || format('{0}-{1}', github.ref, github.run_number) }}
+  cancel-in-progress: true
+
+jobs:
+  Flatpak:
+    if: github.repository == 'LadybirdBrowser/ladybird'
+    name: Flatpak ${{ matrix.arch }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: ['x86_64']
+        runner_labels: ['["blacksmith-16vcpu-ubuntu-2404"]']
+
+        include:
+          - arch: 'aarch64'
+            runner_labels: '["blacksmith-16vcpu-ubuntu-2404-arm"]'
+
+    secrets: inherit
+    uses: ./.github/workflows/flatpak-template.yml
+    with:
+      arch: ${{ matrix.arch }}
+      runner_labels: ${{ matrix.runner_labels }}