Merge branch 'master' into test-reorg

runtimeverification · Jun 15, 2024 · 8e9cca6 · 8e9cca6
2 parents 2db5764 + 7e37a4e
commit 8e9cca6
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 39 deletions.
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -31,7 +31,7 @@ jobs:
       - name: 'Update Poetry files'
         run: |
           K_VERSION="$(cat deps/k_release)"
-          sed -i 's!pyk = { git = "https://github.com/runtimeverification/k.git", tag = "[v0-9\.]*", subdirectory = "pyk" }!pyk = { git = "https://github.com/runtimeverification/k.git", tag = "v'${K_VERSION}'", subdirectory = "pyk" }!' pyproject.toml
+          sed -i 's!kframework = { git = "https://github.com/runtimeverification/k.git", tag = "[v0-9\.]*", subdirectory = "pyk" }!kframework = { git = "https://github.com/runtimeverification/k.git", tag = "v'${K_VERSION}'", subdirectory = "pyk" }!' pyproject.toml
           poetry update
           git add . && git commit -m "pyproject.toml: sync pyk version ${K_VERSION}" || true
       - name: 'Push updates'

diff --git a/deps/k_release b/deps/k_release
@@ -1 +1 @@
-7.0.130
+7.1.4
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -15,7 +15,7 @@ riscv-semantics = "kriscv.kdist.plugin"
 
 [tool.poetry.dependencies]
 python = "^3.10"
-pyk = { git = "https://github.com/runtimeverification/k.git", tag = "v7.0.130", subdirectory = "pyk" }
+kframework = { git = "https://github.com/runtimeverification/k.git", tag = "v7.1.4", subdirectory = "pyk" }
 pyyaml = "^6.0.1"
 types-pyyaml = "^6.0.12.20240311"
 filelock = "^3.14.0"