Skip to content
Open
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/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
- name: pin nixpkgs
run: nix registry add nixpkgs github:NixOS/nixpkgs/nixos-25.05
run: nix registry add nixpkgs github:NixOS/nixpkgs/nixos-25.11
- name: build thymis-controller-generic-x86_64-image
uses: ./.github/actions/run-command-with-nix-cache-upload
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:

- name: Run tests
run: |
nix develop .#ci --command uv run python -m pytest -sxv
nix develop .#ci --command uv run python -m pytest -sxv --ignore=tests/integration
working-directory: controller

- name: Upload new store paths to Nix cache
Expand Down
1 change: 0 additions & 1 deletion agent/thymis_agent/agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,6 @@ async def handle_custom_relay_message(self, message: RelayToAgentMessage):
"--collect",
"--no-ask-password",
"--pipe",
"--quiet",
"--service-type=exec",
"--unit=thymis-nixos-rebuild-switch-to-configuration",
"--wait",
Expand Down
5 changes: 5 additions & 0 deletions controller/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,8 @@ include-package-data = true

[tool.uv.sources]
thymis-agent = { path = "../agent" }

[tool.pytest.ini_options]
markers = [
"integration: marks tests as integration tests requiring KVM and a pre-built controller",
]
Loading
Loading