diff options
| author | Michael Catanzaro <mcatanzaro@redhat.com> | 2021-06-01 06:02:06 -0500 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@redhat.com> | 2021-06-01 06:03:57 -0500 |
| commit | fea0ffc5be004e77cbe0d8925dd69f3b0228bf6a (patch) | |
| tree | 2b06f3b07df1814a0e94c054ccc807c17ef000db | |
| parent | b4dc1504ac0de5cf6a23b7214d626217c8a750fe (diff) | |
| download | epiphany-mcatanzaro/ci.tar.gz | |
ci: Switch scan-build back to GNOME runtime image...mcatanzaro/ci
...because meson in the GNOME runtime has been fixed. See
https://gitlab.com/freedesktop-sdk/freedesktop-sdk/-/issues/1236 for why
we originally had to switch to Fedora.
This means we no longer need Epiphany build dependencies in our primary
CI image, and can switch from Fedora to Alpine to reduce image size.
Maybe this will make the CI marginally faster? Maybe? No reason not to.
Also, Jan-Michael seems to like Alpine. ;)
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile | 12 | ||||
| -rwxr-xr-x | .gitlab-ci/run-podman.sh | 2 |
3 files changed, 10 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d62c84634..9dbb56c28 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ stages: - test check-code-style: - image: registry.gitlab.gnome.org/gnome/epiphany/master:v2 + image: registry.gitlab.gnome.org/gnome/epiphany/master:v4 interruptible: true script: - bash data/check-code-style @@ -41,13 +41,13 @@ flatpak master: - master scanbuild: - image: registry.gitlab.gnome.org/gnome/epiphany/master:v2 + extends: '.flatpak' variables: CONFIG_OPTS: '-Dprofile=Devel -Dunit_tests=enabled --werror' script: - - mkdir _build - - meson ${CONFIG_OPTS} _build - - ninja -C _build scan-build + - flatpak-builder --user --disable-rofiles-fuse --stop-at=${FLATPAK_MODULE} flatpak_app ${MANIFEST_PATH} + - flatpak build flatpak_app meson --prefix=/app ${CONFIG_OPTS} _build + - flatpak build flatpak_app ninja -C _build scan-build - bash -c 'if [[ -n "$(ls -A _build/meson-logs/scanbuild/)" ]]; then echo "Scan build log found, assuming defects exist"; exit 1; fi' artifacts: when: on_failure diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index ab651238d..389c3aad1 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -1,16 +1,12 @@ -FROM fedora:34 +FROM alpine:latest -RUN dnf update -y \ - && dnf install -y uncrustify git nodejs clang-analyzer 'dnf-command(builddep)' \ - && dnf builddep -y epiphany \ - && dnf clean all +RUN apk update && apk add uncrustify bash python3 nodejs nodejs-npm RUN npm install -g eslint -ARG HOST_USER_ID=5555 +ARG HOST_USER_ID=guest ENV HOST_USER_ID ${HOST_USER_ID} -RUN useradd -u $HOST_USER_ID -ms /bin/bash user -USER user +USER guest WORKDIR /home/user ENV LANG C.UTF-8 diff --git a/.gitlab-ci/run-podman.sh b/.gitlab-ci/run-podman.sh index c83229c26..793f0d49b 100755 --- a/.gitlab-ci/run-podman.sh +++ b/.gitlab-ci/run-podman.sh @@ -2,7 +2,7 @@ set -e -TAG="registry.gitlab.gnome.org/gnome/epiphany/master:v2" +TAG="registry.gitlab.gnome.org/gnome/epiphany/master:v4" cd "$(dirname "$0")" |