Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
build:
runs-on: ubuntu-22.04
container:
image: giomba/ceda-cemu-builder:1
image: giomba/ceda-cemu-builder:2
options: --user root
steps:
- name: Checkout repository
Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ function(add_ceda_target target)
target_compile_options(${target} PRIVATE -Werror)
elseif(CMAKE_BUILD_TYPE MATCHES "Debug")
target_compile_options(${target} PRIVATE -DDEBUG=1)
# set(Z80_WITH_HTML_DOCUMENTATION YES)
endif()

target_link_libraries(${target}
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt update && apt upgrade -y
RUN apt install -y git cmake gcc g++ clang-tidy clang-format libsdl2-dev libsdl2-mixer-dev
RUN apt install -y meson ninja-build libffi-dev libgit2-dev
RUN apt install -y doxygen sphinx python3-breathe

RUN git clone https://github.com/Snaipe/Criterion.git && cd Criterion && git checkout master && meson build && meson install -C build

Expand Down
2 changes: 1 addition & 1 deletion script/docker
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ docker run --rm -ti -u builder \
-v "$(pwd)":/home/builder/workspace \
-v /tmp:/tmp \
-w /home/builder/workspace \
giomba/ceda-cemu-builder:1 \
giomba/ceda-cemu-builder:2 \
"$@"
Loading