From 02c0820090da78f48d7c350af4b9f3db4d5d05c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20T=C3=B3th?= Date: Tue, 15 Aug 2023 11:41:47 +0200 Subject: [PATCH] Run Booster tests in a Docker container (#2012) * Run Booster tests in a Docker container * Set Version: 1.0.253 * Set Version: 1.0.254 * Set Version: 1.0.257 * .github/test-pr: build plugin-deps first before building booster foundry defn * .github/test-pr: try running booster tests on normal runner * .github/test-pr: use booster container name * Set Version: 1.0.258 * Set Version: 1.0.259 --------- Co-authored-by: devops Co-authored-by: Everett Hildenbrandt Co-authored-by: rv-jenkins --- .github/workflows/test-pr.yml | 24 ++++++++++++++---------- kevm-pyk/pyproject.toml | 2 +- package/debian/changelog | 2 +- package/version | 2 +- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index c8871a8e94..85ab1d8ceb 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -146,7 +146,7 @@ jobs: test-prove-foundry: name: 'Build and Test KEVM Foundry proofs' needs: kevm-pyk-code-quality-checks - runs-on: [self-hosted, linux, huge] + runs-on: [self-hosted, linux, normal] timeout-minutes: 150 steps: - name: 'Check out code' @@ -178,18 +178,22 @@ jobs: uses: actions/checkout@v3 with: submodules: recursive - - name: 'Build devShell' - env: - CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_PUBLIC_TOKEN }} - run: cachix watch-exec k-framework -- nix build --extra-experimental-features 'nix-command flakes' .#devShell.x86_64-linux.inputDerivation --no-link - - name: 'Build blockchain-k-plugin-deps' - run: nix develop --extra-experimental-features 'nix-command flakes' --command make plugin-deps + - name: 'Set up Docker' + uses: ./.github/actions/with-docker + with: + tag: kevm-ci-booster-${{ github.sha }} - name: 'Build kevm-pyk' - run: nix develop --extra-experimental-features 'nix-command flakes' --command make poetry + run: docker exec -u github-user kevm-ci-booster-${GITHUB_SHA} /bin/bash -c 'make poetry' + - name: 'Build blockchain-k-plugin-deps' + run: docker exec -u github-user kevm-ci-booster-${GITHUB_SHA} /bin/bash -c 'make CXX=clang++-14 plugin-deps' - name: 'Build Foundry' - run: nix develop --extra-experimental-features 'nix-command flakes' --command make build-foundry -j2 + run: docker exec -u github-user kevm-ci-booster-${GITHUB_SHA} /bin/bash -c 'make build-foundry -j2' - name: 'Foundry Prove' - run: nix develop --extra-experimental-features 'nix-command flakes' --command make test-foundry-prove -j2 FOUNDRY_PAR=8 TEST_ARGS=--use-booster + run: docker exec -u github-user kevm-ci-booster-${GITHUB_SHA} /bin/bash -c 'make test-foundry-prove PYTEST_ARGS="-vv --use-booster"' + - name: 'Tear down Docker' + if: always() + run: | + docker stop --time=0 kevm-ci-booster-${GITHUB_SHA} nix: name: 'Nix' diff --git a/kevm-pyk/pyproject.toml b/kevm-pyk/pyproject.toml index 689df31b97..a51e758f9e 100644 --- a/kevm-pyk/pyproject.toml +++ b/kevm-pyk/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "kevm-pyk" -version = "1.0.258" +version = "1.0.259" description = "" authors = [ "Runtime Verification, Inc. ", diff --git a/package/debian/changelog b/package/debian/changelog index 50ead4f01d..92d50e54b4 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,4 +1,4 @@ -kevm (1.0.258) unstable; urgency=medium +kevm (1.0.259) unstable; urgency=medium * Initial Release. diff --git a/package/version b/package/version index 00b4e508a5..1c66c9e097 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -1.0.258 +1.0.259