Update dependency: deps/k_release (#2389)

* deps/k_release: Set Version 7.0.0 * Set Version: 1.0.523 * Adjust workflow * kevm-pyk/: sync poetry files pyk version v7.0.0 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.1 * kevm-pyk/: sync poetry files pyk version v7.0.1 * flake.{nix,lock}: update Nix derivations * Fix `src` in `flake.nix` * deps/k_release: Set Version 7.0.2 * kevm-pyk/: sync poetry files pyk version v7.0.2 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.3 * Set Version: 1.0.524 * kevm-pyk/: sync poetry files pyk version v7.0.3 * flake.{nix,lock}: update Nix derivations --------- Co-authored-by: devops <[email protected]> Co-authored-by: Tamás Tóth <[email protected]>
runtimeverification · Apr 15, 2024 · f1af3eb · f1af3eb
1 parent 4cb939a
commit f1af3eb
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 126 deletions.
diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
@@ -3,7 +3,7 @@ on:
   push:
     branches:
       - '_update-deps/runtimeverification/blockchain-k-plugin'
-      - '_update-deps/runtimeverification/pyk'
+      - '_update-deps/runtimeverification/k'
   workflow_dispatch:
 # Stop in progress workflows on the same branch and same workflow to use latest committed code
 concurrency:
@@ -30,15 +30,10 @@ jobs:
         uses: Gr1N/setup-poetry@v8
       - name: 'Update pyk release tag'
         run: |
-          PYK_VERSION="$(cat deps/pyk_release)"
-          sed -i 's!pyk = { git = "https://github.com/runtimeverification/pyk.git", tag="[v0-9\.]*" }!pyk = { git = "https://github.com/runtimeverification/pyk.git", tag="'${PYK_VERSION}'" }!' kevm-pyk/pyproject.toml
+          K_VERSION=v$(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="'${K_VERSION}'", subdirectory = "pyk" }!' kevm-pyk/pyproject.toml
           poetry -C kevm-pyk update
-          git add kevm-pyk/ && git commit -m "kevm-pyk/: sync poetry files pyk version ${PYK_VERSION}" || true
-      - name: 'Update K release file'
-        run: |
-          K_VERSION=$(poetry -C kevm-pyk run python3 -c 'import pyk; print(pyk.K_VERSION)')
-          echo ${K_VERSION} > deps/k_release
-          git add deps/k_release && git commit -m "deps/k_release: sync release file version ${K_VERSION}" || true
+          git add kevm-pyk/ && git commit -m "kevm-pyk/: sync poetry files pyk version ${K_VERSION}" || true
       - name: 'Update plugin release file'
         run: |
           BKP_VERSION=$(git -C kevm-pyk/src/kevm_pyk/kproj/plugin rev-parse HEAD)
@@ -56,12 +51,11 @@ jobs:
           authToken: ${{ secrets.CACHIX_PUBLIC_TOKEN }}
       - name: 'Update nix flake inputs'
         run: |
-          K_VERSION=$(cat deps/k_release)
+          K_VERSION=v$(cat deps/k_release)
           BKP_VERSION=$(cat deps/blockchain-k-plugin_release)
-          PYK_VERSION=$(cat deps/pyk_release)
-          sed -i 's!    k-framework.url = "github:runtimeverification/k/[v0-9\.]*"!    k-framework.url = "github:runtimeverification/k/v'"${K_VERSION}"'"!' flake.nix
+          sed -i 's!    k-framework.url = "github:runtimeverification/k/[v0-9\.]*"!    k-framework.url = "github:runtimeverification/k/'"${K_VERSION}"'"!' flake.nix
           sed -i 's!    blockchain-k-plugin.url = "github:runtimeverification/blockchain-k-plugin/[0-9a-f]*"!    blockchain-k-plugin.url = "github:runtimeverification/blockchain-k-plugin/'"${BKP_VERSION}"'"!' flake.nix
-          sed -i 's!    pyk.url = "github:runtimeverification/pyk/[v0-9\.]*"!    pyk.url = "github:runtimeverification/pyk/'"${PYK_VERSION}"'"!' flake.nix
+          sed -i 's!    pyk.url = "github:runtimeverification/k/[v0-9\.]*?dir=pyk"!    pyk.url = "github:runtimeverification/k/'"${K_VERSION}"'?dir=pyk"!' flake.nix
           nix run .#update-from-submodules
           nix flake update
           git add flake.nix flake.lock && git commit -m 'flake.{nix,lock}: update Nix derivations' || true

diff --git a/deps/k_release b/deps/k_release
@@ -1 +1 @@
-6.3.77
+7.0.3
diff --git a/deps/pyk_release b/deps/pyk_release
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,11 +2,11 @@
   description = "A flake for the KEVM Semantics";
 
   inputs = {
-    k-framework.url = "github:runtimeverification/k/v6.3.77";
+    k-framework.url = "github:runtimeverification/k/v7.0.3";
     nixpkgs.follows = "k-framework/nixpkgs";
     flake-utils.follows = "k-framework/flake-utils";
     rv-utils.follows = "k-framework/rv-utils";
-    pyk.url = "github:runtimeverification/pyk/v0.1.778";
+    pyk.url = "github:runtimeverification/k/v7.0.3?dir=pyk";
     nixpkgs-pyk.follows = "pyk/nixpkgs";
     poetry2nix.follows = "pyk/poetry2nix";
     blockchain-k-plugin = {
@@ -147,6 +147,11 @@
           kevm-pyk = poetry2nix.mkPoetryApplication {
             python = nixpkgs-pyk.python310;
             projectDir = ./kevm-pyk;
+            src = rv-utils.lib.mkPykAppSrc {
+              pkgs = import nixpkgs { system = prev.system; };
+              src = ./kevm-pyk;
+              cleaner = poetry2nix.cleanPythonSources;
+            };
             overrides = poetry2nix.overrides.withDefaults
               (finalPython: prevPython: {
                 pyk = nixpkgs-pyk.pyk-python310;