Skip to content

Commit

Permalink
Drop the wasm-semantics submodule (#239)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
tothtamas28 and devops authored Apr 19, 2024
1 parent a3d0617 commit eb95126
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 31 deletions.
23 changes: 9 additions & 14 deletions .github/workflows/update-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -24,21 +24,16 @@ jobs:
git config user.email [email protected]
- 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
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
Expand Down
11 changes: 1 addition & 10 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,32 +1,23 @@

.PHONY: all \
test-elrond-adder test-elrond-crowdfunding-esdt \
test-elrond-multisig test-elrond-basic-features \
test-elrond-alloc-features test-elrond-composability-features \
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


Expand Down
1 change: 0 additions & 1 deletion deps/wasm-semantics
Submodule wasm-semantics deleted from b77997
2 changes: 1 addition & 1 deletion kmultiversx/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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. <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion package/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.38
0.1.39

0 comments on commit eb95126

Please sign in to comment.