Update deps/runtimeverification/pyk (#576)

* .gitmodules, deps/k: remove K submodule * .github/update-version: get K version from pyk update * Makefile: remove stuff related to submodule build * pykwasm/: sync poetry files v0.1.631 * deps/pyk_release: Set Version v0.1.635 * pykwasm/: sync poetry files v0.1.635 * deps/k_release: sync release file version 6.2.31 * .github/test-pr: setup version bumper * .github/master-push: publish github releases on master push * Set Version: 0.1.1 --------- Co-authored-by: devops <[email protected]>
runtimeverification · Feb 19, 2024 · 8dfc2ab · 8dfc2ab
1 parent d88cc6f
commit 8dfc2ab
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 133 deletions.
diff --git a/.github/workflows/master-push.yml b/.github/workflows/master-push.yml
@@ -11,16 +11,26 @@ jobs:
     runs-on: ubuntu-latest
     environment: production
     steps:
-      - name: 'Update dependents'
+      - name: 'Check out code'
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.push.head.sha }}
+          fetch-depth: 0
+      - name: 'Make release'
         env:
-          GITHUB_TOKEN: ${{ secrets.JENKINS_GITHUB_PAT }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          set -x
+          VERSION=v$(cat package/version)
+          gh release create ${VERSION} --target ${{ github.sha }}
+      - name: 'Update dependents'
         run: |
           set -x
           version="${GITHUB_SHA}"
           curl --fail                                                          \
             -X POST                                                            \
             -H "Accept: application/vnd.github+json"                           \
-            -H "Authorization: Bearer ${GITHUB_TOKEN}"                         \
+            -H "Authorization: Bearer ${{ secrets.JENKINS_GITHUB_PAT }}"       \
             -H "X-GitHub-Api-Version: 2022-11-28"                              \
             https://api.github.com/repos/runtimeverification/devops/dispatches \
             -d '{"event_type":"on-demand-test","client_payload":{"repo":"runtimeverification/wasm-semantics","version":"'${version}'"}}'
diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml
@@ -8,6 +8,31 @@ concurrency:
 
 jobs:
 
+  version-bump:
+    name: 'Version Bump'
+    runs-on: [self-hosted, linux, flyweight-ephemeral]
+    steps:
+      - name: 'Check out code'
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.JENKINS_GITHUB_PAT }}
+          # fetch-depth 0 means deep clone the repo
+          fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha }}
+      - name: 'Configure GitHub user'
+        run: |
+          git config user.name devops
+          git config user.email [email protected]
+      - name: 'Update version'
+        run: |
+          og_version=$(git show origin/${GITHUB_BASE_REF}:package/version)
+          ./package/version.sh bump ${og_version}
+          ./package/version.sh sub
+          new_version=$(cat package/version)
+          git add --update && git commit --message "Set Version: ${new_version}" || true
+      - name: 'Push updates'
+        run: git push origin HEAD:${GITHUB_HEAD_REF}
+
   pykwasm-code-quality-checks:
     name: 'Code Quality Checks'
     runs-on: ubuntu-latest

diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
@@ -2,7 +2,6 @@ name: 'Update Version'
 on:
   push:
     branches:
-      - '_update-deps/runtimeverification/k'
       - '_update-deps/runtimeverification/pyk'
 # Stop in progress workflows on the same branch and same workflow to use latest committed code
 concurrency:
@@ -23,23 +22,18 @@ jobs:
       - run: |
           git config user.name devops
           git config user.email [email protected]
-      - name: 'Update K submodule'
-        run: |
-          K_VERSION="$(cat deps/k_release)"
-          cd deps/k
-          git fetch --tags
-          git checkout "v${K_VERSION}"
-          cd -
-          git add deps/k && git commit -m "deps/k: sync submodule v${K_VERSION}" || true
+      - name: 'Install Poetry'
+        uses: Gr1N/setup-poetry@v8
       - name: 'Update pyk Release tag'
         run: |
-          curl -sSL https://install.python-poetry.org | python3 - --version 1.3.2
-          poetry --version
           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}'" }!' pykwasm/pyproject.toml
-          cd pykwasm
-          poetry update
-          cd -
+          poetry -C pykwasm update
           git add pykwasm/ && git commit -m "pykwasm/: sync poetry files ${pyk_version}" || true
+      - name: 'Update K release file'
+        run: |
+          K_VERSION=$(poetry -C pykwasm 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
       - name: 'Push updates'
         run: git push
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "deps/k"]
-	path = deps/k
-	url = https://github.com/kframework/k
-	ignore = untracked
 [submodule "tests/wasm-tests"]
 	path = tests/wasm-tests
 	url = https://github.com/webassembly/spec

diff --git a/Makefile b/Makefile
@@ -2,56 +2,17 @@
 # --------
 
 BUILD_DIR := .build
-DEPS_DIR  := deps
 DEFN_DIR  := $(BUILD_DIR)/defn
 K_INCLUDE_DIR ?= $(CURDIR)
 
-K_SUBMODULE := $(DEPS_DIR)/k
-ifneq (,$(wildcard deps/k/k-distribution/target/release/k/bin/*))
-  K_RELEASE ?= $(abspath $(K_SUBMODULE)/k-distribution/target/release/k)
-else
-  K_RELEASE ?= $(dir $(shell which kompile))..
-endif
-K_BIN := $(K_RELEASE)/bin
-K_LIB := $(K_RELEASE)/lib/kframework
-export K_RELEASE
-
-ifneq ($(RELEASE),)
-    K_BUILD_TYPE := Release
-else
-    K_BUILD_TYPE := Debug
-endif
-
-PATH := $(K_BIN):$(PATH)
-export PATH
-
-PYK_PATH             := $(abspath $(K_SUBMODULE)/pyk/src/)
-PYWASM_PATH          := ./deps/py-wasm
-
-PYTHONPATH := $(PYK_PATH)
-export PYTHONPATH
-
-.PHONY: all clean deps                                                     \
+.PHONY: all                                                                \
         build build-llvm build-haskell build-wrc20                         \
         test test-execution test-simple test-prove                         \
         test-conformance test-conformance-parse test-conformance-supported \
         media presentations reports
 
 all: build
 
-clean:
-	rm -rf $(BUILD_DIR)
-
-# Build Dependencies (K Submodule)
-# --------------------------------
-
-K_JAR := $(K_SUBMODULE)/k-distribution/target/release/k/lib/java/kernel-1.0-SNAPSHOT.jar
-
-deps: $(K_JAR) $(TANGLER)
-
-$(K_JAR):
-	cd $(K_SUBMODULE) && mvn package -DskipTests -Dproject.build.type=$(K_BUILD_TYPE)
-
 # Building Definition
 # -------------------
 

diff --git a/deps/k b/deps/k
diff --git a/deps/k_release b/deps/k_release
@@ -1 +1 @@
-6.2.27
+6.2.31
diff --git a/deps/pyk_release b/deps/pyk_release
@@ -1 +1 @@
-v0.1.631
+v0.1.635
diff --git a/package/version b/package/version
@@ -1 +1 @@
-0.1.0
+0.1.1