From ac2848e58e3c689536aacb8d60451520f8eb6f79 Mon Sep 17 00:00:00 2001 From: karmacoma Date: Fri, 19 Jul 2024 16:05:03 -0700 Subject: [PATCH] More printing of the halmos version Note: during CI builds, we only perform a sparse checkout so we expect the printed version to be slightly wonky, e.g. `halmos 0.1.dev1+g81b7ae5` (base tag is wrong, number of commits ahead is wrong, but git hash is correct) For released images, we expect the version string to be correct (e.g. `halmos 0.1.14`) --- .github/workflows/publish-halmos-package.yml | 3 +++ .github/workflows/test-external.yml | 2 +- .github/workflows/test-ffi.yml | 2 +- .github/workflows/test-long.yml | 2 +- tests/lib/forge-std | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish-halmos-package.yml b/.github/workflows/publish-halmos-package.yml index 2a42514d..5a15301c 100644 --- a/.github/workflows/publish-halmos-package.yml +++ b/.github/workflows/publish-halmos-package.yml @@ -39,6 +39,9 @@ jobs: - name: Build image run: docker build . --file packages/halmos/Dockerfile --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}" + - name: Print halmos version + run: docker run $IMAGE_NAME --version + - name: Push image run: | IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME diff --git a/.github/workflows/test-external.yml b/.github/workflows/test-external.yml index 943c21c7..f6438976 100644 --- a/.github/workflows/test-external.yml +++ b/.github/workflows/test-external.yml @@ -86,7 +86,7 @@ jobs: submodules: recursive - name: Print halmos version - run: docker run -v .:/workspace halmos-image --version + run: docker run halmos-image --version - name: Test external repo run: docker run -v .:/workspace halmos-image ${{ matrix.project.cmd }} --statistics --solver-timeout-assertion 0 --solver-threads 4 ${{ matrix.cache-solver }} ${{ inputs.halmos-options }} diff --git a/.github/workflows/test-ffi.yml b/.github/workflows/test-ffi.yml index 63e26c28..0b91757d 100644 --- a/.github/workflows/test-ffi.yml +++ b/.github/workflows/test-ffi.yml @@ -37,7 +37,7 @@ jobs: docker build -t halmos-image . --file packages/halmos/Dockerfile - name: Print halmos version - run: docker run -v .:/workspace halmos-image --version + run: docker run halmos-image --version - name: Run pytest run: docker run -v .:/workspace --entrypoint pytest halmos-image -v tests/test_halmos.py -k ${{ matrix.testname }} --halmos-options="--ffi -v -st --solver-timeout-assertion 0" diff --git a/.github/workflows/test-long.yml b/.github/workflows/test-long.yml index 39006688..0f357777 100644 --- a/.github/workflows/test-long.yml +++ b/.github/workflows/test-long.yml @@ -46,7 +46,7 @@ jobs: docker build -t halmos-image . --file packages/halmos/Dockerfile - name: Print halmos version - run: docker run -v .:/workspace halmos-image --version + run: docker run halmos-image --version - name: Run pytest run: | diff --git a/tests/lib/forge-std b/tests/lib/forge-std index 978ac6fa..74cfb77e 160000 --- a/tests/lib/forge-std +++ b/tests/lib/forge-std @@ -1 +1 @@ -Subproject commit 978ac6fadb62f5f0b723c996f64be52eddba6801 +Subproject commit 74cfb77e308dd188d2f58864aaf44963ae6b88b1