Merge branch 'master' into remove-build-lemmas

Author: palinatolmach

.github/workflows/test-pr.yml

@@ -94,7 +94,7 @@ jobs:
           if [ ${{ matrix.backend }} == 'legacy' ]; then
             TEST_ARGS+=' --no-use-booster --numprocesses=6'
           else
-            TEST_ARGS+=' --numprocesses=4'
+            TEST_ARGS+=' --numprocesses=3'
           fi
           docker exec --user github-user kontrol-ci-integration-${GITHUB_SHA} make cov-integration TEST_ARGS="${TEST_ARGS}"
       - name: 'Tear down Docker'
@@ -214,7 +214,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runner: [ubuntu-latest, macos-13, MacM1]  # MacM1 is self-hosted
+        runner: [normal, macos-13, MacM1]  # MacM1 / normal are self-hosted, 
     runs-on: ${{ matrix.runner }}
     timeout-minutes: 60
     steps:

.github/workflows/update-expected-output.yml

@@ -28,7 +28,7 @@ jobs:
             docker exec -u github-user kontrol-ci-integration-${GITHUB_SHA} /bin/bash -c 'CXX=clang++-14 poetry run kdist --verbose build -j`nproc` evm-semantics.haskell kontrol.foundry'
       - name: 'Run integration tests'
         run: |
-          TEST_ARGS="--maxfail=1000 --numprocesses=4 --update-expected-output --force-sequential -vv"
+          TEST_ARGS="--maxfail=1000 --numprocesses=2 --update-expected-output --force-sequential -vv"
           docker exec --user github-user kontrol-ci-integration-${GITHUB_SHA} bash -c "make cov-integration TEST_ARGS='${TEST_ARGS} -k \"not (test_kontrol_cse or test_foundry_minimize_proof or test_kontrol_end_to_end)\"' || true"
           docker exec --user github-user kontrol-ci-integration-${GITHUB_SHA} bash -c "make cov-integration TEST_ARGS='${TEST_ARGS} -k \"test_kontrol_cse or test_foundry_minimize_proof\"' || true"
           docker exec --user github-user kontrol-ci-integration-${GITHUB_SHA} bash -c "make cov-integration TEST_ARGS='${TEST_ARGS} -k \"test_kontrol_end_to_end\"' || true"