Skip to content

Commit 25c7de6

Browse files
committed
Revert "ci: try build appimage on ubuntu 18.04"
This reverts commit dc7c281.
1 parent dc7c281 commit 25c7de6

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/ci-build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,13 @@ jobs:
107107
cmake_opts:
108108

109109
- os: ubuntu_appimage
110-
os_version: 18.04
110+
os_version: 20.04
111111
arch: x64
112112
artifacts_id: appimage
113113
package_suffix: AppImage
114-
container_root: docker/ubuntu18.04_qt5.15
115-
container: variar/klogg_ubuntu18.04
116-
cmake_opts: -DKLOGG_USE_VECTORSCAN=OFF -DKLOGG_USE_HYPERSCAN=ON
114+
container_root: docker/ubuntu20.04
115+
container: variar/klogg_ubuntu20.04
116+
cmake_opts:
117117

118118

119119
runs-on: ubuntu-22.04

docker/ubuntu18.04_qt5.15/Dockerfile renamed to docker/ubuntu20.04_qt5.15/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM ubuntu:bionic
1+
FROM ubuntu:focal
22

33
ENV DEBIAN_FRONTEND=noninteractive
44

55
RUN apt-get update -y && \
66
apt-get install --no-install-recommends software-properties-common -y && \
7-
add-apt-repository ppa:beineri/opt-qt-5.15.2-bionic -y && \
7+
add-apt-repository ppa:beineri/opt-qt-5.15.3-focal -y && \
88
apt-get update -y && \
9-
apt-get install --no-install-recommends build-essential python3 \
9+
apt-get install --no-install-recommends build-essential python3 python-is-python3 \
1010
qt515base qt515svg qt515tools qt515imageformats qt515translations \
1111
mesa-common-dev libglu1-mesa-dev \
1212
libboost-dev libicu-dev libssl-dev libcurl4-openssl-dev \

0 commit comments

Comments
 (0)