From 5a16f121006a600fb096b8463bb40cd733b07899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20T=C3=B3th?= Date: Thu, 11 Apr 2024 18:44:22 +0000 Subject: [PATCH] Adjust workflow --- .github/workflows/update-version.yml | 16 +++++----------- flake.nix | 4 ++-- kevm-pyk/pyproject.toml | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index d152f0d25f..71c2708270 100644 --- 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="$(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) @@ -58,10 +53,9 @@ jobs: run: | K_VERSION=$(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! 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/flake.nix b/flake.nix index 6170b4775a..96c9a19e10 100644 --- 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/v0.0.0"; 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/v0.0.0?dir=pyk"; nixpkgs-pyk.follows = "pyk/nixpkgs"; poetry2nix.follows = "pyk/poetry2nix"; blockchain-k-plugin = { diff --git a/kevm-pyk/pyproject.toml b/kevm-pyk/pyproject.toml index dac9d2ffbc..c12c49a133 100644 --- a/kevm-pyk/pyproject.toml +++ b/kevm-pyk/pyproject.toml @@ -13,7 +13,7 @@ authors = [ [tool.poetry.dependencies] python = "^3.10" pathos = "*" -pyk = { git = "https://github.com/runtimeverification/pyk.git", tag="v0.1.778" } +pyk = { git = "https://github.com/runtimeverification/k.git", tag="v0.0.0", subdirectory = "pyk" } tomlkit = "^0.11.6" [tool.poetry.group.dev.dependencies]