beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 00:50:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Meta: Update the devcontainer configuration

Browse source 
Update the base image and the feature images
Add new packages to the install.sh command
as they are now needed by some dependencies, that are built via vcpkg
Add newer clang version, but the default stays the same
This commit is contained in:
Totto16 2024-10-11 20:03:41 +02:00 committed by Andrew Kaster
parent 711faa8280
commit 846a3a16e2
Notes: github-actions[bot] 2024-10-12 17:35:57 +00:00 
Author: https://github.com/Totto16
Commit: https://github.com/LadybirdBrowser/ladybird/commit/846a3a16e24
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/1738
Reviewed-by: https://github.com/ADKaster ✅
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.devcontainer/devcontainer.json
View file

@ -1,11 +1,11 @@
{ {
"name": "Ladybird", "name": "Ladybird",
"image": "mcr.microsoft.com/devcontainers/base:jammy", "image": "mcr.microsoft.com/devcontainers/base:noble",
// Features to add to the dev container. More info: https://containers.dev/implementors/features. // Features to add to the dev container. More info: https://containers.dev/implementors/features.
"features": { "features": {
"ghcr.io/devcontainers/features/github-cli:1": {}, "ghcr.io/devcontainers/features/github-cli:1": {},
"ghcr.io/devcontainers-contrib/features/pre-commit:1": {}, "ghcr.io/devcontainers-contrib/features/pre-commit:2": {},
"./features/ladybird": { "./features/ladybird": {
"llvm_version": 18, "llvm_version": 18,
}, },

1
.devcontainer/features/ladybird/devcontainer-feature.json
View file

@ -9,6 +9,7 @@
"proposals": [ "proposals": [
17, 17,
18, 18,
19,
"trunk" "trunk"
], ],
"default": 18, "default": 18,

2
.devcontainer/features/ladybird/install.sh
View file

@ -28,7 +28,7 @@ install_llvm_key() {
### Install packages ### Install packages
apt update -y apt update -y
apt install -y lsb-release git python3 autoconf autoconf-archive automake build-essential cmake libavcodec-dev libgl1-mesa-dev ninja-build qt6-base-dev qt6-tools-dev-tools qt6-multimedia-dev qt6-wayland ccache fonts-liberation2 zip unzip curl tar apt install -y lsb-release git python3 autoconf autoconf-archive automake build-essential cmake libavcodec-dev libavformat-dev libavutil-dev libgl1-mesa-dev nasm ninja-build pkg-config qt6-base-dev qt6-tools-dev-tools qt6-multimedia-dev qt6-wayland ccache fonts-liberation2 zip unzip curl tar
### Ensure new enough host compiler is available ### Ensure new enough host compiler is available
VERSION="0.0.0" VERSION="0.0.0"

1
Documentation/BuildInstructionsLadybird.md
View file

@ -13,6 +13,7 @@ CMake 3.25 or newer must be available in $PATH.
### Debian/Ubuntu: ### Debian/Ubuntu:
<!-- Note: If you change something here, please also change it in the `devcontainer/devcontainer.json` file. -->
```bash ```bash
sudo apt install autoconf autoconf-archive automake build-essential ccache cmake curl fonts-liberation2 git libavcodec-dev libavformat-dev libavutil-dev libgl1-mesa-dev nasm ninja-build pkg-config qt6-base-dev qt6-tools-dev-tools qt6-wayland tar unzip zip sudo apt install autoconf autoconf-archive automake build-essential ccache cmake curl fonts-liberation2 git libavcodec-dev libavformat-dev libavutil-dev libgl1-mesa-dev nasm ninja-build pkg-config qt6-base-dev qt6-tools-dev-tools qt6-wayland tar unzip zip
``` ```