Skip to content

Commit

Permalink
ci: use debian instead of ubuntu. fuck ubuntu
Browse files Browse the repository at this point in the history
fuck ubuntu, even here it is has packages that are too old. Qt is 6.2.4 and
it misses "qt_standard_project_setup" which I used.
  • Loading branch information
haxscramper committed Mar 9, 2024
1 parent 5740723 commit 2412f0f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
8 changes: 5 additions & 3 deletions scripts/py_repository/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:latest
FROM debian:latest

RUN apt-get update
RUN apt-get install -y python3.11 python3.11-dev python3.11-venv python3-pip curl wget git
RUN curl -sSL https://install.python-poetry.org | python3.11 -
Expand All @@ -24,6 +25,7 @@ RUN rm "clang+llvm-17.0.6-x86_64-linux-gnu-ubuntu-22.04.tar.xz"

WORKDIR /haxorg

RUN apt-get install -y qt6-base-dev qt6-base-dev-tools qt6-declarative-dev qt6-quick3d-dev qt6-quick3d-dev-tools
RUN apt-get install -y qt6-base-dev qt6-declarative-dev qt6-quick3d-dev
RUN apt-get install -y ninja-build pkg-config libkrb5-dev libssl-dev
RUN apt-get install -y libgl1-mesa-dev libglu1-mesa-dev qt6-core-tools-dev
RUN apt-get install -y libgl1-mesa-dev libglu1-mesa-dev
RUN apt-get install -y libxkbcommon-dev libpcre2-dev libgraphviz-dev libboost-all-dev
2 changes: 1 addition & 1 deletion src/cmake/target_lib.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ endif()
# Use re-flex static library as a direct dependency here so it would be compiled
# and linked with right sanitizer options (otherwise it triggers lots of false
# positives)
add_subdirectory("${BASE}/toolchain/RE-flex")
add_subdirectory("${BASE}/thirdparty/RE-flex")

target_link_libraries(haxorg PUBLIC
${GRAPHVIZ_CGRAPH_LIBRARY}
Expand Down
2 changes: 2 additions & 0 deletions tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,9 +331,11 @@ def mnt(local: str, container: Optional[str] = None) -> List[str]:
mnt(it) for it in [
"src",
"scripts",
"tests",
"tasks.py",
"invoke.yaml",
"pyproject.toml",
"ignorelist.txt",
".git",
"thirdparty",
"CMakeLists.txt",
Expand Down

0 comments on commit 2412f0f

Please sign in to comment.