Merge branch 'master' into feat/disallow-debug-format

Author: saibatizoku

.config/dictionaries/project.dic

@@ -1,4 +1,5 @@
 aarch
+autogen
 bindgen
 binstall
 bkioshn
@@ -11,6 +12,7 @@ chtml
 codegen
 colordiff
 cowsay
+cuelang
 cytopia
 depgraph
 devenv
@@ -24,6 +26,7 @@ doublecircle
 Earthfile
 Earthfiles
 Edgedriver
+EPREFIX
 errchkjson
 extldflags
 findutils
@@ -67,9 +70,13 @@ libasound
 libatk
 libatspi
 libdrm
+libexpat
+libfreetype
 libgbm
 libgcc
+liblasi
 libnss
+librsvg
 libsqlite
 libxkbcommon
 libxshmfence
@@ -81,13 +88,17 @@ metno
 mithril
 mkdocs
 modcache
+molinski
 mozallowfullscreen
 msedgedriver
+multilib
 multirepo
 nextest
 nilnil
 nixos
 nixpkgs
+noninteractive
+nproc
 onsi
 penwidth
 pkeyopt
@@ -126,6 +137,7 @@ testunit
 Timoni
 toolsets
 transpiling
+trixie
 UDCs
 unarchiving
 uniseg

docs/Earthfile

@@ -21,8 +21,7 @@ src:
     COPY --dir postgresql-ci+build/docs src/appendix/examples/built_docs/postgresql
 
 # Build the docs here.
-# TODO: Enable when our earthly self-satellites will be back
-disable-docs:
+docs:
     FROM +src
 
     DO docs-ci+BUILD

earthly/cue/Earthfile

@@ -0,0 +1,26 @@
+VERSION 0.8
+
+IMPORT ../debian AS debian
+
+# Define a constant name for the container and its version.
+ARG --global CUE_IMAGE="cuelang/cue:0.14.1"
+
+
+INSTALL:
+    FUNCTION
+
+     COPY +cue-bin/cue /usr/bin/cue
+
+
+# Get cue binary
+cue-bin:
+    FROM $CUE_IMAGE
+    SAVE ARTIFACT /usr/bin/cue
+
+# Just check that Cue can be properly installed, and runs.
+check-cue:
+    FROM debian+common
+    
+    DO +INSTALL
+
+    RUN cue version

earthly/cue/blueprint.cue

@@ -0,0 +1 @@
+project: name: "ci-cue"

earthly/debian/Earthfile

@@ -0,0 +1,62 @@
+VERSION 0.8
+
+# Define a constant name for the container and its version.
+ARG --global DEBIAN_IMAGE="debian:13.0-slim"
+
+# Optimally install packages for debian
+INSTALL:
+    FUNCTION
+
+    ARG packages
+
+    # Install the packages and leave no garbage behind
+    # Also don't install anything not explicitly asked for.
+    ENV DEBIAN_FRONTEND=noninteractive
+    RUN set -eux; \
+        apt-get update --fix-missing \
+        && apt-get install -y --no-install-recommends $packages \
+        && apt-get dist-clean \
+        && rm -rf /var/lib/apt/lists/*
+
+# The current version of our base Debian Container.
+# Clean with nothing added.
+debian-clean:
+    FROM $DEBIAN_IMAGE
+
+
+# The current version of our base Debian Container.
+# Normally you want this because it has all the common tools
+# one would expect inside CI.
+common:
+    FROM +debian-clean
+
+    LET PACKAGES= \
+        ca-certificates \
+        apt-utils \
+        git \
+        curl \
+        gzip \
+        unzip \
+        bzip2 \
+        bash \
+        jq \
+        gpg \
+        lcov \
+        tar \
+        wget \
+        xz-utils
+    DO +INSTALL --packages=$PACKAGES
+
+# Checks our debian container is basically usable, and nothing more.
+check-debian:
+    FROM +common
+
+    RUN cat /etc/os-release
+
+version-check-debian:
+    FROM +debian
+
+    # The idea here is the version check will check if the image its using is the latest image in docker hub.
+    # This would need to be run without cache, and should be a special target.
+    # We need a general solution to help us track our containers and make sure we are aware when they are out of date.
+    RUN exit 1

earthly/debian/blueprint.cue

@@ -0,0 +1 @@
+project: name: "ci-debian"

earthly/docs/Earthfile

@@ -1,6 +1,7 @@
 VERSION 0.8
 
 IMPORT ../python AS python-ci
+IMPORT ../debian AS debian
 IMPORT ../../utilities/scripts AS scripts
 
 # cspell: words libfreetype liblcms libopenjp etag
@@ -14,21 +15,21 @@ deps:
     # This is all the tooling needed to build the docs.
 
     # Install extra packages we will need to support plugins.
-    RUN apt-get install -y \
-        graphviz \
+    LET PACKAGES= \
         fontconfig \
-        fonts-liberation \
         libxml2-dev \
-        libxslt1-dev \
         libffi-dev \
-        libssl-dev \
         libfreetype6-dev \
+        libtiff-dev \
+        libssl-dev \
+        fonts-liberation \
+        libxslt1-dev \
         liblcms2-dev \
         libopenjp2-7-dev \
-        libtiff-dev \
         tk-dev \
         tcl-dev  \
         make
+    DO debian+INSTALL --packages=$PACKAGES
 
     # Fix up font cache
     RUN fc-cache -f

earthly/flutter/Earthfile

@@ -8,7 +8,7 @@ IMPORT ./installer AS installer
 # Install flutter.
 INSTALL_FLUTTER:
     FUNCTION
-    ARG version=3.29.3
+    ARG version=3.35.1
     ARG TARGETARCH
 
     # Install Flutter
@@ -234,30 +234,51 @@ UNIT_TESTS:
     END
 
 # Build web app and save artifacts locally if needed.
+# TODO(damian-molinski): This target should become BUILD_APP with platforms ARG.
+# platforms='web,android,ios'
+# Because `sentry_dart_plugin` requires access to .dart_tool as well as flutter itself
+# and using `sentry-cli` instead seems to not be worth effort.
 BUILD_WEB:
     FUNCTION
 
     ARG --required TARGET
     ARG BUILD_MODE='--release'
+    ARG --required BUILD_NAME
+    ARG --required BUILD_NUMBER
     ARG SAVE_LOCALLY=false
     ARG WORKDIR
-    ARG SENTRY_UPLOAD_DEBUG_SYMBOLS=false
-    ARG BUILD_ARGS=''
+    ARG UPLOAD_DEBUG_SYMBOLS=false
+    ARG SENTRY_ORG
+    ARG SENTRY_PROJECT
 
     WORKDIR $WORKDIR
 
-    IF [ $SENTRY_UPLOAD_DEBUG_SYMBOLS = true ]
-        IF [ ! echo "$BUILD_ARGS" | grep -q -- '--source-maps' ]
-            ARG BUILD_ARGS='$BUILD_ARGS --source-maps'
-        END
+    LET ADDITIONAL_BUILD_ARGS = ""
+    LET SENTRY_RELEASE = "$SENTRY_PROJECT@$BUILD_NAME+$BUILD_NUMBER"
+    LET SENTRY_DIST = "$BUILD_NUMBER"
+
+    IF [ $UPLOAD_DEBUG_SYMBOLS = true ]
+        SET ADDITIONAL_BUILD_ARGS = "--dart-define=SENTRY_RELEASE=$SENTRY_RELEASE $ADDITIONAL_BUILD_ARGS"
+        SET ADDITIONAL_BUILD_ARGS = "--dart-define=SENTRY_DIST=$SENTRY_DIST $ADDITIONAL_BUILD_ARGS"
+        SET ADDITIONAL_BUILD_ARGS = "$ADDITIONAL_BUILD_ARGS --source-maps"
     END
 
     RUN flutter clean
     RUN flutter pub get
-    RUN flutter build web $BUILD_MODE --pwa-strategy=none --target $TARGET --build-number=$(date +%s) $BUILD_ARGS
-
-    IF [ $SENTRY_UPLOAD_DEBUG_SYMBOLS = true ]
-        RUN flutter pub run sentry_dart_plugin
+    RUN flutter build web $BUILD_MODE \
+        --pwa-strategy=none \
+        --target $TARGET \
+        --build-name=$BUILD_NAME \
+        --build-number=$BUILD_NUMBER \
+        $ADDITIONAL_BUILD_ARGS
+
+    IF [ $UPLOAD_DEBUG_SYMBOLS = true ]
+        RUN --secret SENTRY_AUTH_TOKEN=SENTRY_AUTH_TOKEN \
+            flutter pub run sentry_dart_plugin \
+            --sentry-define=org=$SENTRY_ORG \
+            --sentry-define=project=$SENTRY_PROJECT \
+            --sentry-define=release=$SENTRY_RELEASE \
+            --sentry-define=dist=$SENTRY_DIST
     END
 
     WORKDIR "$WORKDIR/build"

earthly/graphviz/Earthfile

@@ -0,0 +1,38 @@
+VERSION 0.8
+
+IMPORT ../debian AS debian
+
+# Define a constant name for the container and its version.
+ARG --global VERSION=13.1.0
+ARG --global SHA256=13339b83ee5467001a035cfacd175702ac4b14f5d390f0d34e89437b29881278
+ARG --global URL=https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${VERSION}/graphviz-${VERSION}.tar.xz
+
+# Sadly this is the only way to reliably pin a version of graphviz in debian.
+INSTALL:
+    FUNCTION
+
+    LET PACKAGES= \
+        build-essential \
+        pkg-config \
+        libexpat1-dev \
+        zlib1g-dev \
+        libpng-dev \
+        libfreetype-dev \
+        librsvg2-dev \
+        liblasi-dev \
+        wget
+    DO debian+INSTALL --packages=$PACKAGES
+
+    RUN mkdir build; \
+        cd build; \
+        wget -nv -O graphviz-${VERSION}.tar.xz "$URL" \
+        && echo "${SHA256}  graphviz-${VERSION}.tar.xz" | sha256sum -c - \
+        && tar -xf graphviz-${VERSION}.tar.xz \
+        && cd graphviz-${VERSION} \
+        && echo "Building Graphviz ${VERSION}" \
+        && ./configure > /dev/null 2>&1 \
+        && make -j"$(nproc)" > /dev/null 2>&1 \
+        && make install > /dev/null 2>&1 \
+        && cd ../.. \
+        && rm -rf build \
+        && echo "Graphviz built and installed OK"

earthly/python/Earthfile

@@ -3,22 +3,37 @@ VERSION 0.8
 
 IMPORT ../../utilities/scripts AS scripts
 IMPORT ../../ AS cat-ci
+IMPORT ../debian AS debian
+IMPORT ../cue AS cue
+IMPORT ../graphviz AS graphviz
+
+
+# Define a constant name for the container and its version.
+ARG --global PYTHON_IMAGE="python:3.13-slim-trixie"
 
 # cspell: words libjpeg ruff
 
 python-base:
-    FROM python:3.13-slim-bookworm
+    FROM $PYTHON_IMAGE
 
     # Install necessary packages
-    RUN apt-get update && apt-get install -y \
+    LET PACKAGES= \
         bash \
         curl \
         libffi-dev \
         gcc \
         musl-dev \
         zlib1g-dev \
         libjpeg-dev \
-        git
+        git \
+        jq
+    DO debian+INSTALL --packages=$PACKAGES
+
+    # Install CUE
+    DO cue+INSTALL
+
+    # Install Graphviz
+    DO graphviz+INSTALL
 
     # Poetry Installation directory.
     # Gives poetry and our poetry project a reliable location.