Skip to content

Commit d24cc74

Browse files
authored
Merge branch 'master' into dc/loop-error-fix
2 parents 5f817f7 + b680768 commit d24cc74

File tree

7 files changed

+167
-140
lines changed

7 files changed

+167
-140
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
with:
5050
container-name: mir-semantics-ci-${{ github.sha }}
5151
- name: 'Build stable-mir-json and kmir'
52-
run: docker exec --user github-user mir-semantics-ci-${GITHUB_SHA} make stable-mir-json build
52+
run: docker exec --user github-user mir-semantics-ci-${GITHUB_SHA} make build
5353
- name: 'Run integration tests'
5454
run: docker exec --user github-user mir-semantics-ci-${GITHUB_SHA} make test-integration
5555
- name: 'Tear down Docker'

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ smir-parse-tests: # build # commented out for CI's sake
4949
test-unit:
5050
$(UV_RUN) pytest $(TOP_DIR)/kmir/src/tests/unit --maxfail=1 --verbose $(TEST_ARGS)
5151

52-
test-integration: build
52+
test-integration: stable-mir-json build
5353
$(UV_RUN) pytest $(TOP_DIR)/kmir/src/tests/integration --maxfail=1 --verbose \
5454
--durations=0 --numprocesses=$(PARALLEL) --dist=worksteal $(TEST_ARGS)
5555

deps/k_release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.1.265
1+
7.1.268

flake.lock

Lines changed: 53 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
description = "kmir - ";
33
inputs = {
4-
k-framework.url = "github:runtimeverification/k/v7.1.265";
4+
k-framework.url = "github:runtimeverification/k/v7.1.268";
55
nixpkgs.follows = "k-framework/nixpkgs";
66
flake-utils.follows = "k-framework/flake-utils";
7-
rv-utils.follows = "k-framework/rv-utils";
7+
rv-nix-tools.follows = "k-framework/rv-nix-tools";
88
poetry2nix.follows = "k-framework/poetry2nix";
99
};
1010
outputs = { self, nixpkgs, flake-utils, k-framework, ... }@inputs:

kmir/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ version = "0.3.181"
88
description = ""
99
requires-python = "~=3.10"
1010
dependencies = [
11-
"kframework==v7.1.265",
11+
"kframework==v7.1.268",
1212
]
1313

1414
[[project.authors]]

0 commit comments

Comments
 (0)