Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(core): use Cairo proc macros #2710

Draft
wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

feat(core): use Cairo proc macros #2710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2520b02
feat(core): use proc macro instead of Dojo plugin
remybar Dec 4, 2024
05316e5
rename core-cairo-test to core-foundry-test
remybar Dec 6, 2024
fa8d622
replace custom cairo-test runner by scarb test runner
remybar Dec 6, 2024
56ef856
fix warnings + handle scarb test args
remybar Dec 9, 2024
3a680f2
fix examples tests
remybar Dec 9, 2024
9cdb3ac
add comments to snf test helpers
remybar Dec 9, 2024
dcdc35c
review comments
remybar Dec 10, 2024
7af57a9
use snforge command to run sozo tests
remybar Dec 10, 2024
bfd9997
rebuild artifacts
remybar Dec 10, 2024
479c7b0
use instead of command
remybar Dec 10, 2024
567c294
install snfoundry in dev container
remybar Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ ARG DOJO_VERSION=stable
ARG BUILD_TYPE=default
RUN curl -L https://install.dojoengine.org | bash
RUN curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | bash
RUN curl -L https://raw.githubusercontent.com/foundry-rs/starknet-foundry/master/scripts/install.sh | bash
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will do a run on a dojo branch to generate a container that you can use to work with it.

We're about to bump cairo, will do this right after. Like so you can also update to cairo 2.9. 👍

ENV PATH=${PATH}:/root/.dojo/bin
RUN if [ "$BUILD_TYPE" = "release" ]; then \
echo "Installing Dojo version $DOJO_VERSION"; \
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
scarb --manifest-path examples/spawn-and-move/Scarb.toml fmt --check
scarb --manifest-path examples/simple/Scarb.toml fmt --check
scarb --manifest-path crates/dojo/core/Scarb.toml fmt --check
scarb --manifest-path crates/dojo/core-cairo-test/Scarb.toml fmt --check
scarb --manifest-path crates/dojo/core-foundry-test/Scarb.toml fmt --check
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wondering if we should keep both during a time? Since everybody may not migrate to foundry (at least for now?).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But proc macros are disabled with the cairo test runner, so if we keep core-cairo-test, I think we also have to keep the Dojo plugin 😕 I don't know if it's possible to mix both plugin and proc macros ?


dojo-core-test:
needs: build
Expand All @@ -132,8 +132,7 @@ jobs:
- uses: actions/checkout@v3
- run: |
chmod +x /tmp/bins/sozo
/tmp/bins/sozo --manifest-path crates/dojo/core/Scarb.toml test
/tmp/bins/sozo --manifest-path crates/dojo/core-cairo-test/Scarb.toml test
/tmp/bins/sozo --manifest-path crates/dojo/core-foundry-test/Scarb.toml test

dojo-spawn-and-move-example-test:
needs: build
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,16 @@ jobs:
VERSION_NAME: v${{ needs.prepare.outputs.tag_name }}
run: |
if [ "$PLATFORM_NAME" == "linux" ]; then
tar -czvf "dojo_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" -C ./target/${TARGET}/release katana sozo torii dojo-language-server
tar -czvf "dojo_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" -C ./target/${TARGET}/release katana sozo torii
echo "file_name=dojo_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" >> $GITHUB_OUTPUT
elif [ "$PLATFORM_NAME" == "darwin" ]; then
# We need to use gtar here otherwise the archive is corrupt.
# See: https://github.com/actions/virtual-environments/issues/2619
gtar -czvf "dojo_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" -C ./target/${TARGET}/release katana sozo torii dojo-language-server
gtar -czvf "dojo_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" -C ./target/${TARGET}/release katana sozo torii
echo "file_name=dojo_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" >> $GITHUB_OUTPUT
else
cd ./target/${TARGET}/release
7z a -tzip "dojo_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.zip" katana.exe sozo.exe torii.exe dojo-language-server.exe
7z a -tzip "dojo_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.zip" katana.exe sozo.exe torii.exe
mv "dojo_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.zip" ../../../
echo "file_name=dojo_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" >> $GITHUB_OUTPUT
fi
Expand Down
Loading
Loading