Skip to content

Commit

Permalink
fix workflows (#330)
Browse files Browse the repository at this point in the history
  • Loading branch information
karmacoma-eth authored Jul 26, 2024
1 parent 29827c4 commit d4c0124
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 92 deletions.
76 changes: 0 additions & 76 deletions .github/workflows/codeql.yml

This file was deleted.

2 changes: 0 additions & 2 deletions .github/workflows/test-external.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: Test external projects
on:
push:
branches: [main, chore-workflows]
paths:
- .github/workflows/test-external.yml
workflow_dispatch:
inputs:
halmos-options:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-ffi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: Test FFI
on:
push:
branches: [main, chore-workflows]
paths:
- .github/workflows/test-ffi.yml
pull_request:
branches: [main]
workflow_dispatch:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-long.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: Test long
on:
push:
branches: [main, chore-workflows]
paths:
- .github/workflows/test-long.yml
workflow_dispatch:
inputs:
halmos-options:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: Test
on:
push:
branches: [main, chore-workflows]
paths:
- .github/workflows/test.yml
pull_request:
branches: [main]
workflow_dispatch:
Expand All @@ -28,7 +26,7 @@ jobs:
fail-fast: false
matrix:
os: ["macos-latest", "ubuntu-latest", "windows-latest"]
python-version: ["3.9", "3.10", "3.11", "3.12"]
python-version: ["3.11", "3.12"]
parallel: ["", "--test-parallel"]
storage-layout: ["solidity", "generic"]

Expand Down
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
[submodule "tests/lib/forge-std"]
path = tests/lib/forge-std
url = https://github.com/foundry-rs/forge-std
shallow = true
[submodule "tests/lib/halmos-cheatcodes"]
path = tests/lib/halmos-cheatcodes
url = https://github.com/a16z/halmos-cheatcodes
shallow = true
[submodule "tests/lib/openzeppelin-contracts"]
path = tests/lib/openzeppelin-contracts
url = https://github.com/OpenZeppelin/openzeppelin-contracts
shallow = true
[submodule "tests/lib/solmate"]
path = tests/lib/solmate
url = https://github.com/transmissions11/solmate
shallow = true
[submodule "tests/lib/solady"]
path = tests/lib/solady
url = https://github.com/Vectorized/solady
shallow = true
[submodule "tests/lib/multicaller"]
path = tests/lib/multicaller
url = https://github.com/Vectorized/multicaller
shallow = true
1 change: 0 additions & 1 deletion packages/halmos-builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ COPY --from=ghcr.io/foundry-rs/foundry:latest \
ADD --chmod=755 https://astral.sh/uv/install.sh /install.sh
RUN /install.sh && rm /install.sh
ENV PATH="/root/.cargo/bin:${PATH}"

5 changes: 1 addition & 4 deletions packages/halmos/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
# FROM ghcr.io/a16z/halmos-builder:latest

# TODO: switch to :latest as soon as the image is available
FROM ghcr.io/a16z/halmos-builder:chore-workflows
FROM ghcr.io/a16z/halmos-builder:latest

# Enable the virtual environment
ENV PATH="/halmos/.venv/bin:$PATH"
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ classifiers = [
"License :: OSI Approved :: GNU Affero General Public License v3",
"Operating System :: OS Independent",
]
requires-python = ">=3.9"
requires-python = ">=3.11"
dependencies = [
"sortedcontainers>=2.4.0",
"toml>=0.10.2",
Expand All @@ -35,7 +35,7 @@ halmos = "halmos.__main__:main"
"Homepage" = "https://github.com/a16z/halmos"

[tool.black]
target-version = ["py39", "py310", "py311", "py312"]
target-version = ["py311", "py312"]

[tool.pytest.ini_options]
# TODO: re-add test_traces.py when we have a better way to support it in CI
Expand Down

0 comments on commit d4c0124

Please sign in to comment.