Skip to content
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
1 change: 1 addition & 0 deletions .config/dictionaries/project.dic
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ fontawesome
fontconfig
fontname
forcelabels
gdebi
Geckodriver
genpkey
giga
Expand Down
7 changes: 3 additions & 4 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ IMPORT ./earthly/cspell AS cspell-ci
IMPORT ./earthly/bash AS bash-ci
IMPORT ./earthly/spectral AS spectral-ci
IMPORT ./earthly/python AS python-ci
IMPORT ./earthly/debian AS debian

ARG --global REGISTRY="harbor.shared-services.projectcatalyst.io/dockerhub/library"

Expand All @@ -23,7 +24,7 @@ markdown-check-fix:

# Make sure the project dictionary is properly sorted.
clean-spelling-list:
FROM ${REGISTRY}/debian:stable-slim
FROM debian+debian-clean
DO cspell-ci+CLEAN

# check-spelling Check spelling in this repo inside a container.
Expand All @@ -32,8 +33,6 @@ check-spelling:

# check-bash - test all bash files lint properly according to shellcheck.
check-bash:
FROM ${REGISTRY}/alpine:3.20.3

DO bash-ci+SHELLCHECK --src=.

# Internal: Reference to our repo root documentation used by docs builder.
Expand Down Expand Up @@ -66,4 +65,4 @@ edit-docs:
# are linted equally.
# Its also fast.
check-python:
DO python-ci+LINT_PYTHON
DO python-ci+LINT_PYTHON
2 changes: 0 additions & 2 deletions docs/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,8 @@ src:
# Build the docs here.
docs:
FROM +src

DO docs-ci+BUILD


# Make a docker image that can serve the docs for development purposes.
# This target is only for local developer use.
local:
Expand Down
2 changes: 1 addition & 1 deletion docs/src/guides/languages/flutter.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ In case you have unit tests in your project, you can run them with `unit-tests`
unit-tests:
FROM +builder

DO flutter-ci+UNIT_TEST
DO flutter-ci+UNIT_TESTS
```

### Build Flutter app for Web
Expand Down
5 changes: 2 additions & 3 deletions earthly/bash/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ builder:

# Copy our common scripts so we can use them inside the container.
# Internally in the repo we use a symlink to accomplish this, but Earthly
# Will only copy the symlink and not what it references, so we need to
# manually copy what it references. This enables the script to work
# will only copy the symlink and not what it references, so we need to
# manually copy what it references. This enables the script to work
# both in-repo and in-ci here.
DO scripts+ADD_BASH_SCRIPTS

Expand All @@ -31,4 +31,3 @@ SHELLCHECK:
COPY --dir $src /src

RUN ./check-all.sh /src

2 changes: 1 addition & 1 deletion earthly/cassandra/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ CQL_TO_D2:
ARG --required input
ARG --required output

COPY (+cql-to-d2/diagrams --input=$input) $output
COPY (+cql-to-d2/diagrams --input=$input) $output
2 changes: 1 addition & 1 deletion earthly/cddl/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ cddl-base:
ARG REGISTRY="harbor.shared-services.projectcatalyst.io/dockerhub/library"
FROM ${REGISTRY}/ruby:3.3.0-alpine

RUN gem install cddlc
RUN gem install cddlc
5 changes: 2 additions & 3 deletions earthly/cue/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ ARG --global CUE_IMAGE="harbor.shared-services.projectcatalyst.io/dockerhub/cuel
INSTALL:
FUNCTION

COPY +cue-bin/cue /usr/bin/cue

COPY +cue-bin/cue /usr/bin/cue

# Get cue binary
cue-bin:
Expand All @@ -23,4 +22,4 @@ check-cue:

DO +INSTALL

RUN cue version
RUN cue version
11 changes: 5 additions & 6 deletions earthly/debian/Earthfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VERSION 0.8

# Define a constant name for the container and its version.
ARG --global DEBIAN_IMAGE="harbor.shared-services.projectcatalyst.io/dockerhub/library/debian:13.0-slim"
ARG --global DEBIAN_IMAGE="harbor.shared-services.projectcatalyst.io/dockerhub/library/debian:stable-slim"

# Optimally install packages for debian
INSTALL:
Expand All @@ -23,10 +23,10 @@ INSTALL:
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.
# gdebi-core is used to more easily manage dependency conflicts.
common:
FROM +debian-clean

Expand All @@ -35,16 +35,15 @@ common:
apt-utils \
git \
curl \
gzip \
unzip \
bzip2 \
bash \
jq \
gpg \
lcov \
tar \
wget \
xz-utils
build-essential \
xz-utils \
gdebi-core
DO +INSTALL --packages=$PACKAGES

# Checks our debian container is basically usable, and nothing more.
Expand Down
9 changes: 3 additions & 6 deletions earthly/docs/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ deps:
liblcms2-dev \
libopenjp2-7-dev \
tk-dev \
tcl-dev \
tcl-dev \
make
DO debian+INSTALL --packages=$PACKAGES

Expand All @@ -52,7 +52,6 @@ deps:
# Set working directory
WORKDIR /docs


# Documentation files used across all documentation builds.
common:
FROM scratch
Expand Down Expand Up @@ -91,8 +90,7 @@ SRC:
# Any files which replace the standard files are copied here
COPY --if-exists --dir includes macros overrides .


# Build the docs - We always do this in a `docs` target.
# Build the docs - We always do this in a `docs` target.
# The only target that needs customizing is the `src` target.
BUILD:
FUNCTION
Expand Down Expand Up @@ -133,8 +131,7 @@ PACKAGE:
# These steps are done outside the FUNCTION.

# Copy the static pages into the container like this...
#COPY $docs /usr/share/nginx/html
# COPY $docs /usr/share/nginx/html

# And then save the image
# SAVE IMAGE image_name

29 changes: 7 additions & 22 deletions earthly/flutter/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ VERSION 0.8
# cspell: words noninteractive

IMPORT ./installer AS installer
IMPORT ../debian AS debian

ARG --global REGISTRY="harbor.shared-services.projectcatalyst.io/dockerhub/library"

Expand Down Expand Up @@ -40,42 +41,27 @@ INSTALL_FLUTTER:

# flutter-base installs required tools and packages.
flutter-base:
FROM ${REGISTRY}/debian:bookworm-20250203-slim
FROM debian+common

ENV DEBIAN_FRONTEND=noninteractive

# Update and install as same command so if either fails, the whole step fails and is not cached.
# sqlite3 and libsqlite3-dev are required for running db tests in CI
RUN apt-get update --fix-missing && \
apt-get install -y \
apt-utils \
git \
curl \
gzip \
unzip \
bzip2 \
bash \
jq \
gpg \
lcov \
tar \
wget \
xz-utils \
sqlite3 \
libsqlite3-dev

DO +INSTALL_FLUTTER

WORKDIR frontend

DO installer+INSTALL_CHROME_LINUX64
DO installer+INSTALL_FIREFOX_LINUX64
# DO installer+INSTALL_CHROME_LINUX64 --version=141.0.7390.122
DO installer+INSTALL_CHROME_FOR_TESTING --version=141.0.7390.122
DO installer+INSTALL_FIREFOX_LINUX64 --version=115.15.0esr-1
DO installer+INSTALL_EDGE_LINUX64 --version=125.0.2535.51

ARG edge_version = 125.0.2535.51
ARG edge_package_release = 1
DO installer+INSTALL_EDGE_LINUX64 --edge_version=$edge_version --edge_package_release=$edge_package_release

# test-flutter-base : installs required tools and packages for flutter development.
# test-flutter-base: installs required tools and packages for flutter development.
test-flutter-base:
BUILD +flutter-base

Expand Down Expand Up @@ -159,7 +145,6 @@ PUBLISH_DRY_RUN:
RUN dart pub publish --dry-run
END


# Runs unit tests.
UNIT_TESTS:
FUNCTION
Expand Down
Loading
Loading