Merge remote-tracking branch 'upstream/master' into merge-nodes

Author: ehildenb

.github/workflows/test-pr.yml

@@ -84,42 +84,29 @@ jobs:
   integration-tests:
     needs: code-quality-checks
     name: 'Integration Tests'
-    runs-on: [self-hosted, linux, normal]
+    runs-on: [self-hosted, linux, normal-ephemeral]
     strategy:
       matrix:
         python-version: ['3.10', '3.11']
     steps:
       - name: 'Check out code'
         uses: actions/checkout@v3
-      - name: 'Build Docker image'
-        run: |
-          COMMIT=$(git rev-parse --short=7 HEAD)
-          K_VERSION=$(cut --delim=v --field=2 deps/k_release)
-
-          docker build .                                            \
-            --build-arg PYTHON_VERSION=${{ matrix.python-version }} \
-            --build-arg K_VERSION=${K_VERSION}                      \
-            --tag runtimeverificationinc/pyk-ci:${COMMIT}
-
-          docker run             \
-            --name pyk-ci        \
-            --rm                 \
-            --interactive        \
-            --tty                \
-            --detach             \
-            --workdir /home/user \
-            runtimeverificationinc/pyk-ci:${COMMIT}
-
-          docker cp . pyk-ci:/home/user
-          docker exec pyk-ci chown -R user:user /home/user
-      - name: 'Set Python version'
-        run: docker exec --user user pyk-ci poetry env use ${{ matrix.python-version }}
-      - name: 'Build and run integration tests'
-        run: docker exec --user user pyk-ci make cov-integration COV_ARGS=-n8
-      - name: 'Tear down Docker container'
-        if: always()
+      - name: 'Install Python'
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: 'Install Poetry'
+        uses: Gr1N/setup-poetry@v8
+      - name: 'Install K'
         run: |
-          docker stop --time=0 pyk-ci
+          K_VERSION=$(cat deps/k_release)
+          DEB_PACKAGE_NAME=kframework_${K_VERSION}_amd64_ubuntu_jammy.deb
+          wget https://github.com/runtimeverification/k/releases/download/v${K_VERSION}/${DEB_PACKAGE_NAME}
+          sudo apt-get update
+          sudo apt-get -y install graphviz ./${DEB_PACKAGE_NAME}
+          kompile --version
+      - name: 'Run integration tests'
+        run: make cov-integration COV_ARGS='-n8'
 
   build-on-nix:
     needs: code-quality-checks

Dockerfile

@@ -4,12 +4,12 @@ FROM runtimeverificationinc/kframework-k:ubuntu-${K_DISTRO}-${K_VERSION}
 
 ARG PYTHON_VERSION=3.10
 
-RUN    apt-get -y update           \
-    && apt-get -y install          \
-         curl                      \
-         graphviz                  \
-         python$PYTHON_VERSION     \
-         python$PYTHON_VERSION-dev \
+RUN    apt-get -y update             \
+    && apt-get -y install            \
+         curl                        \
+         graphviz                    \
+         python${PYTHON_VERSION}     \
+         python${PYTHON_VERSION}-dev \
     && apt-get -y clean
 
 RUN    curl -sSL https://install.python-poetry.org | POETRY_HOME=/usr python3 - \

deps/k_release

@@ -1 +1 @@
-6.0.24
+6.0.33

package/version

@@ -1 +1 @@
-0.1.372
+0.1.384

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "pyk"
-version = "0.1.372"
+version = "0.1.384"
 description = ""
 authors = [
     "Runtime Verification, Inc. <[email protected]>",

src/pyk/__init__.py

@@ -6,4 +6,4 @@
     from typing import Final
 
 
-K_VERSION: Final = '6.0.24'
+K_VERSION: Final = '6.0.33'