Author SHA1 Message Date
zachandAramJonghu 9bab59ba0f Merge branch 'main' into feat/task-runner-ci
C++ / fmt (pull_request) Successful in 5s
JS/TS / fmt & lint (pull_request) Successful in 17s
Python / fmt & lint (pull_request) Successful in 44s
C++ / build & lint (pull_request) Failing after 2m26s
Python / test & nuitka build (pull_request) Failing after 1m41s
Rust / build, clippy & fmt (pull_request) Failing after 6m24s
2026-10-25 01:34:38 +02:00
AramJonghu 08d0c0e9fc feat(makefile): added qmlformat + install -> compile in cpp step 2026-10-25 01:34:38 +02:00
AramJonghu 82b93e3193 feat(makefile): C++, Python, and Rust checks included (incomplete) 2026-10-25 01:34:38 +02:00
AramJonghu 509b9d1831 feat(makefile): makefile build & install + progress on cpp and py 2026-10-25 01:34:38 +02:00
AramJonghu 2bf6b9cc1f format(clang): make cpp-fmt result 2026-10-25 01:34:38 +02:00
AramJonghu 8cc9ff36e7 ci: rework Dockerfile image + buildx dep added 2026-10-25 01:34:38 +02:00
AramJonghu e25b864982 refactor(workflows): combined steps where it makes sense 2026-10-25 01:34:38 +02:00
AramJonghu 417be33c6a fix(ci): missing dependency wayland-scanner 2026-10-25 01:34:38 +02:00
6 changed files with 20 additions and 35 deletions
+2 -4
View File
@@ -40,7 +40,5 @@ jobs:
run: |
sed -i 's/-mno-direct-extern-access //g' build/compile_commands.json
set -o pipefail
run-clang-tidy -p build -j "$(nproc)" \
-source-filter="^$(pwd)/Plugins/" \
-header-filter=".*Plugins/.*" \
-removed-arg=-mno-direct-extern-access
run-clang-tidy -p build -j $(nproc) -header-filter="Plugins/.*" 2>&1 | \
grep -v 'Suppressed\|non-user\|non-system\|unknown argument.*mno-direct\|Found compiler error\|warnings generated\.\|^Use -header-filter'
+10 -22
View File
@@ -1,35 +1,23 @@
**/__pycache__/
./result/
.pyre/
.cache/
.venv/
.qmlls.ini
build/
compile_commands.json
testpython
pkg/
*.tar.*
uv.lock
.qtcreator/
dist/
**/target/
**/test-plugins/
**/Charts/
network-dev/
**/zshell.dist/
# Qml
.qtcreator/
.qmlls.ini
# CMake compile artifacts
.cache/
compile_commands.json
build/
# Python
uv.lock
testpython
.venv/
**/__pycache__/
# Nuitka compile
**/zshell.pyi
**/zshell.cpython-*
**/zshell.build/
# Agents stuff
**/zshell.dist/
.opencode/
run-agent.sh
AGENTS.md
-1
View File
@@ -50,7 +50,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(QT_NO_PRIVATE_MODULE_WARNING ON)
set(ENABLE_MODULES "plugin;shell;cli;m3shapes" CACHE STRING "Modules to build/install")
set(INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/ZShell" CACHE STRING "Library install dir")
+1
View File
@@ -38,6 +38,7 @@ Item {
id: container
anchors.fill: parent
layer.enabled: opacity < 1
objectName: "PageContainer"
Component.onCompleted: root.loadPage(root.sState.currentPageIdx)
+2 -2
View File
@@ -3,9 +3,9 @@ FROM archlinux:latest
RUN pacman -Syu --noconfirm \
&& pacman -S --needed --noconfirm \
base-devel cmake ninja clang lld nodejs tree-sitter \
jkqtplotter cmark-gfm git wayland-protocols ffmpeg mpv \
jkqtplotter cmark-gfm git wayland-protocols \
qt6-base qt6-declarative qt6-shadertools qt6-5compat \
qt6-canvaspainter qt6-wayland qt5-wayland \
qt6-canvaspainter qt6-wayland qt5-wayland\
libqalculate pipewire aubio cava lm_sensors glib2 \
&& pacman -Scc --noconfirm
+5 -6
View File
@@ -1,11 +1,9 @@
BUILD ?= cmake -B build -G Ninja
NONUITKA ?= cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_MODULES="plugin;shell;m3shapes"
NINJA ?= ninja -C build
COMPILE ?= $(BUILD) && $(NINJA)
INSTALL ?= $(BUILD) && $(NINJA) && sudo ninja -C build install
CPPFMT ?= find . \( -name '*.cpp' -o -name '*.h' -o -name '*.hpp' \) -not -path './build/*' -exec clang-format -i --style=file {} +
CPPLINT ?= run-clang-tidy -p build -j "$$(nproc)" -source-filter="^$$(pwd)/Plugins/" -header-filter=".*Plugins/.*" -removed-arg=-mno-direct-extern-access
NUITKA ?= nuitka --module --include-package=zshell cli/src/zshell/ --output-dir=cli/
@@ -18,7 +16,7 @@ help:
@echo "compile cmake builds and compiles C++ code"
@echo "cpp-fmt format C++ code with clang-format"
@echo "cpp-lint lint check C++ code with clang-tidy"
@echo "cpp-compile similar to make compile, but excludes Nuitka from compiling python"
@echo "cpp-compile alias to make compile"
@echo "py-fmt format Python code with ruff"
@echo "py-lint lint check Python code with ruff"
@echo "py-check lsp and typecheck all Python code using Basedpyright"
@@ -42,15 +40,16 @@ install:
compile:
$(COMPILE)
# TODO: Anything below is not ready
# C++
cpp-fmt:
$(CPPFMT)
cpp-lint:
$(CPPLINT)
# cpp-lint needs adjustments in ci and here
cpp-compile:
$(NONUITKA)
$(COMPILE)
# Python
py-fmt: