From eb9512667dc981beac476292505582c412a0f06f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20T=C3=B3th?= Date: Fri, 19 Apr 2024 10:42:43 +0200 Subject: [PATCH] Drop the `wasm-semantics` submodule (#239) * Set Version: 0.1.39 * Remove the `wasm-semantics` submodule * Test update workflow * kmultiversx/: sync poetry files 0.1.35 * deps/k_release: sync release file version 7.0.9 * Restore trigger --------- Co-authored-by: devops --- .github/workflows/update-version.yml | 23 +++++++++-------------- .gitmodules | 4 ---- Makefile | 11 +---------- deps/wasm-semantics | 1 - kmultiversx/pyproject.toml | 2 +- package/version | 2 +- 6 files changed, 12 insertions(+), 31 deletions(-) delete mode 160000 deps/wasm-semantics diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index f9269d75..e1859198 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -15,7 +15,7 @@ jobs: steps: - name: 'Check out code' uses: actions/checkout@v3 - with: + with: submodules: recursive token: ${{ secrets.JENKINS_GITHUB_PAT }} - name: 'Configure GitHub user' @@ -24,21 +24,16 @@ jobs: git config user.email devops@runtimeverification.com - name: 'Install Poetry' uses: Gr1N/setup-poetry@v8 - - name: 'Update KWasm submodule, K release' - run: | - kwasm_version=$(cat deps/kwasm_release) - cd deps/wasm-semantics/ - git fetch --tags - git checkout v${kwasm_version} - cd ../.. - git add deps/wasm-semantics && git commit -m "deps/wasm-semantics: update submodule v${kwasm_version}" || true - cat deps/wasm-semantics/deps/k_release > deps/k_release - git add deps/k_release && git commit -m 'deps/k_release: update versions' || true - name: 'Update poetry files' run: | - pykwasm_version="$(cat deps/kwasm_release)" - sed -i 's!pykwasm = { git = "https://github.com/runtimeverification/wasm-semantics.git", tag = "[v0-9\.]*", subdirectory = "pykwasm" }!pykwasm = { git = "https://github.com/runtimeverification/wasm-semantics.git", tag = "v'${pykwasm_version}'", subdirectory = "pykwasm" }!' kmultiversx/pyproject.toml + PYKWASM_VERSION="$(cat deps/kwasm_release)" + sed -i 's!pykwasm = { git = "https://github.com/runtimeverification/wasm-semantics.git", tag = "[v0-9\.]*", subdirectory = "pykwasm" }!pykwasm = { git = "https://github.com/runtimeverification/wasm-semantics.git", tag = "v'${PYKWASM_VERSION}'", subdirectory = "pykwasm" }!' kmultiversx/pyproject.toml poetry -C kmultiversx update - git add kmultiversx/ && git commit -m "kmultiversx/: sync poetry files ${pykwasm_version}" || true + git add kmultiversx/ && git commit -m "kmultiversx/: sync poetry files ${PYKWASM_VERSION}" || true + - name: 'Update K release' + run: | + K_VERSION=$(poetry -C kmultiversx run python3 -c 'import pyk; print(pyk.__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 - name: 'Push updates' run: git push diff --git a/.gitmodules b/.gitmodules index 0b721291..79214157 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,3 @@ -[submodule "deps/wasm-semantics"] - path = deps/wasm-semantics - url = https://github.com/kframework/wasm-semantics - ignore = untracked [submodule "deps/plugin"] path = deps/plugin url = https://github.com/runtimeverification/blockchain-k-plugin.git diff --git a/Makefile b/Makefile index 557af21b..343b7a54 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,3 @@ - .PHONY: all \ test-elrond-adder test-elrond-crowdfunding-esdt \ test-elrond-multisig test-elrond-basic-features \ @@ -6,27 +5,19 @@ test-elrond-addercaller test-elrond-callercallee test-custom-contracts \ rule-coverage clean-coverage \ + # Settings # -------- DEPS_DIR := deps PLUGIN_SUBMODULE := $(abspath $(DEPS_DIR)/plugin) -export PLUGIN_SUBMODULE - -KWASM_SUBMODULE := $(DEPS_DIR)/wasm-semantics -K_SUBMODULE := $(KWASM_SUBMODULE)/deps/k -KWASM_BINARY_PARSER := $(KWASM_SUBMODULE)/binary-parser ELROND_SDK_SUBMODULE := $(DEPS_DIR)/mx-sdk-rs ELROND_CONTRACT := $(ELROND_SDK_SUBMODULE)/contracts ELROND_CONTRACT_EXAMPLES := $(ELROND_CONTRACT)/examples -PYTHONPATH := $(K_LIB):$(KWASM_BINARY_PARSER):$(PYTHONPATH) -export PYTHONPATH - - all: build diff --git a/deps/wasm-semantics b/deps/wasm-semantics deleted file mode 160000 index b779976e..00000000 --- a/deps/wasm-semantics +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b779976e85b05a14386ee8ae5f0f563c9ffab7a8 diff --git a/kmultiversx/pyproject.toml b/kmultiversx/pyproject.toml index 62c6964d..e6dd934c 100644 --- a/kmultiversx/pyproject.toml +++ b/kmultiversx/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "kmultiversx" -version = "0.1.38" +version = "0.1.39" description = "Python tools for Elrond semantics" authors = [ "Runtime Verification, Inc. ", diff --git a/package/version b/package/version index 5786113b..528bd040 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.1.38 +0.1.39