Skip to content

Commit

Permalink
CI: move to Ubuntu 22.04.
Browse files Browse the repository at this point in the history
This MR moves the CI pipelines to `tallfurryman/kstars-ci:0.11`, built against Ubuntu 22.04 beginning 202302.
  • Loading branch information
TallFurryMan authored and knro committed Feb 18, 2023
1 parent 437afb6 commit f19d353
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ stages:
- test
#- test-unstable

image: tallfurryman/kstars-ci:0.9
image: tallfurryman/kstars-ci:0.11

variables:
CCACHE_BASEDIR: "$CI_PROJECT_DIR"
Expand Down
14 changes: 8 additions & 6 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:latest
FROM ubuntu:22.04

# Suitable for builds
RUN apt update && apt -y install --no-install-recommends software-properties-common
RUN apt update && apt -y install --no-install-recommends software-properties-common gpg-agent
RUN apt update && add-apt-repository ppa:mutlaqja/indinightly
RUN apt update && apt -y install --no-install-recommends \
gcc-multilib \
Expand All @@ -18,7 +18,7 @@ RUN apt update && apt -y install --no-install-recommends \
libqt5websockets5-dev \
libqt5svg5-dev \
libqt5sql5-sqlite \
kdoctools-dev \
libkf5doctools-dev \
libkf5config-dev \
libkf5guiaddons-dev \
libkf5i18n-dev \
Expand All @@ -40,8 +40,11 @@ RUN apt update && apt -y install --no-install-recommends \
libsecret-1-dev

# Suitable for tests
RUN apt update && add-apt-repository ppa:mutlaqja/indinightly
RUN apt update && add-apt-repository ppa:mutlaqja/ppa
RUN apt update && add-apt-repository ppa:pch/phd2

ENV TZ=Greenwich
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
RUN apt update && apt -y --no-install-recommends install \
make \
cmake \
Expand Down Expand Up @@ -79,8 +82,7 @@ RUN apt update && apt -y --no-install-recommends install \
desktop-file-utils \
libgdk-pixbuf2.0-dev \
fakeroot \
wget \
gpg-agent
wget

# Saxon
RUN apt install -y --no-install-recommends \
Expand Down

0 comments on commit f19d353

Please sign in to comment.