diff options
| author | Roman Stratiienko <r.stratiienko@gmail.com> | 2023-09-20 00:16:08 +0300 |
|---|---|---|
| committer | Roman Stratiienko <r.stratiienko@gmail.com> | 2023-09-20 00:23:32 +0300 |
| commit | 87b716c07097d0979ac7544641fd49a55f868278 (patch) | |
| tree | 6f216c4d853602f5b1a56fd4e6f6b46b41b52f21 | |
| parent | bdc4382f8baaf9cfc95f6f818af9d138938ddde8 (diff) | |
| download | drm_hwcomposer-87b716c07097d0979ac7544641fd49a55f868278.tar.gz | |
drm_hwcomposer: CI: Update runner os to ubuntu 23.04
Ubuntu 22.10 is no longer supported and can't be used as a runner OS.
Change-Id: Ib52c3849442dfcedb6a94c5e7c7bbff948e5060c
Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
| -rw-r--r-- | .ci/Dockerfile | 8 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.ci/Dockerfile b/.ci/Dockerfile index 32c348f..d8672c5 100644 --- a/.ci/Dockerfile +++ b/.ci/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.10 +FROM ubuntu:23.04 ENV DEBIAN_FRONTEND=noninteractive @@ -7,11 +7,11 @@ ENV PATH="/home/user/bin:${PATH}" # Taking into account layer structure, everything should be done within one layer. RUN apt-get update && apt-get upgrade -y && \ apt-get install -y clang-15 clang-tidy-15 clang-format-15 git libdrm-dev blueprint-tools libgtest-dev clang \ - llvm make python3 python3-pip wget sudo rsync lld pkg-config ninja-build && \ - pip3 install mako meson jinja2 ply pyyaml + llvm make python3 wget sudo rsync lld pkg-config ninja-build meson \ + python3-mako python3-jinja2 python3-ply python3-yaml ENV RUN_USER user -ENV RUN_UID 1000 +ENV RUN_UID 1001 ENV USER_HOME /home/${RUN_USER} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bfc4ede..1836bd5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: ubuntu:22.10 +image: ubuntu:23.04 variables: DEBIAN_FRONTEND: noninteractive @@ -6,8 +6,8 @@ variables: before_script: - apt-get --quiet update --yes >/dev/null - apt-get --quiet install --yes clang-15 clang-tidy-15 clang-format-15 git libdrm-dev blueprint-tools libgtest-dev make >/dev/null - - apt-get --quiet install --yes clang llvm make python3 python3-pip wget sudo rsync lld pkg-config ninja-build >/dev/null - - pip3 install mako meson jinja2 ply pyyaml >/dev/null + - apt-get --quiet install --yes clang llvm make python3 wget sudo rsync lld pkg-config ninja-build meson >/dev/null + - apt-get --quiet install --yes python3-mako python3-jinja2 python3-ply python3-yaml >/dev/null stages: - build |