Skip to content
This repository was archived by the owner on Apr 25, 2024. It is now read-only.

Commit fefe75d

Browse files
Move back to ephemeral runners (#479)
This reverts commit c26ba34. --------- Co-authored-by: devops <[email protected]>
1 parent 174ce21 commit fefe75d

File tree

4 files changed

+24
-37
lines changed

4 files changed

+24
-37
lines changed

.github/workflows/test-pr.yml

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -72,42 +72,29 @@ jobs:
7272
integration-tests:
7373
needs: code-quality-checks
7474
name: 'Integration Tests'
75-
runs-on: [self-hosted, linux, normal]
75+
runs-on: [self-hosted, linux, normal-ephemeral]
7676
strategy:
7777
matrix:
7878
python-version: ['3.10', '3.11']
7979
steps:
8080
- name: 'Check out code'
8181
uses: actions/checkout@v3
82-
- name: 'Build Docker image'
83-
run: |
84-
COMMIT=$(git rev-parse --short=7 HEAD)
85-
K_VERSION=$(cut --delim=v --field=2 deps/k_release)
86-
87-
docker build . \
88-
--build-arg PYTHON_VERSION=${{ matrix.python-version }} \
89-
--build-arg K_VERSION=${K_VERSION} \
90-
--tag runtimeverificationinc/pyk-ci:${COMMIT}
91-
92-
docker run \
93-
--name pyk-ci \
94-
--rm \
95-
--interactive \
96-
--tty \
97-
--detach \
98-
--workdir /home/user \
99-
runtimeverificationinc/pyk-ci:${COMMIT}
100-
101-
docker cp . pyk-ci:/home/user
102-
docker exec pyk-ci chown -R user:user /home/user
103-
- name: 'Set Python version'
104-
run: docker exec --user user pyk-ci poetry env use ${{ matrix.python-version }}
105-
- name: 'Build and run integration tests'
106-
run: docker exec --user user pyk-ci make cov-integration COV_ARGS=-n8
107-
- name: 'Tear down Docker container'
108-
if: always()
82+
- name: 'Install Python'
83+
uses: actions/setup-python@v4
84+
with:
85+
python-version: ${{ matrix.python-version }}
86+
- name: 'Install Poetry'
87+
uses: Gr1N/setup-poetry@v8
88+
- name: 'Install K'
10989
run: |
110-
docker stop --time=0 pyk-ci
90+
K_VERSION=$(cat deps/k_release)
91+
DEB_PACKAGE_NAME=kframework_${K_VERSION}_amd64_ubuntu_jammy.deb
92+
wget https://github.com/runtimeverification/k/releases/download/v${K_VERSION}/${DEB_PACKAGE_NAME}
93+
sudo apt-get update
94+
sudo apt-get -y install graphviz ./${DEB_PACKAGE_NAME}
95+
kompile --version
96+
- name: 'Run integration tests'
97+
run: make cov-integration COV_ARGS='-n8'
11198

11299
build-on-nix:
113100
needs: code-quality-checks

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ FROM runtimeverificationinc/kframework-k:ubuntu-${K_DISTRO}-${K_VERSION}
44

55
ARG PYTHON_VERSION=3.10
66

7-
RUN apt-get -y update \
8-
&& apt-get -y install \
9-
curl \
10-
graphviz \
11-
python$PYTHON_VERSION \
12-
python$PYTHON_VERSION-dev \
7+
RUN apt-get -y update \
8+
&& apt-get -y install \
9+
curl \
10+
graphviz \
11+
python${PYTHON_VERSION} \
12+
python${PYTHON_VERSION}-dev \
1313
&& apt-get -y clean
1414

1515
RUN curl -sSL https://install.python-poetry.org | POETRY_HOME=/usr python3 - \

package/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.318
1+
0.1.319

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
44

55
[tool.poetry]
66
name = "pyk"
7-
version = "0.1.318"
7+
version = "0.1.319"
88
description = ""
99
authors = [
1010
"Runtime Verification, Inc. <[email protected]>",

0 commit comments

Comments
 (0)