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.

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

♻️ Refactor packages #5

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 16 additions & 9 deletions .github/workflows/examples.yml → .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
name: Origami Examples CI
name: Origami CI

on: [push, pull_request]

env:
DOJO_VERSION: v0.3.4
DOJO_VERSION: v0.3.6
SCARB_VERSION: v2.3.1
WORKING_DIRECTORY: examples

jobs:
check:
Expand All @@ -17,7 +16,6 @@ jobs:
with:
scarb-version: ${{ env.SCARB_VERSION }}
- name: Format
working-directory: ${{ env.WORKING_DIRECTORY }}
run: scarb fmt --check
shell: bash

Expand All @@ -29,30 +27,39 @@ jobs:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup
- name: Build
working-directory: ${{ env.WORKING_DIRECTORY }}
run: sozo build
shell: bash

origami:
needs: [check, build]
runs-on: ubuntu-latest
name: Test crates
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup
- name: Test
run: sozo test -f origami
shell: bash


market:
needs: [check, build]
runs-on: ubuntu-latest
name: Test market
name: Test example market
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup
- name: Test
working-directory: ${{ env.WORKING_DIRECTORY }}
run: sozo test -f market
shell: bash

projectile:
needs: [check, build]
runs-on: ubuntu-latest
name: Test projectile
name: Test example projectile
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup
- name: Test
working-directory: ${{ env.WORKING_DIRECTORY }}
run: sozo test -f projectile
shell: bash
42 changes: 0 additions & 42 deletions .github/workflows/origami.yml

This file was deleted.

23 changes: 20 additions & 3 deletions Scarb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,23 @@ source = "git+https://github.com/influenceth/cubit?rev=b459053#b4590530d5aeae9aa

[[package]]
name = "dojo"
version = "0.3.4"
source = "git+https://github.com/dojoengine/dojo?tag=v0.3.4#a3140d88b08b79c5ff2261c1db81bafe80b5cc91"
version = "0.3.6"
source = "git+https://github.com/dojoengine/dojo?tag=v0.3.6#08f1eba55b53de56b08221ae093a00f799fa60c1"
dependencies = [
"dojo_plugin",
]

[[package]]
name = "dojo_plugin"
version = "0.3.4"
version = "0.3.6"

[[package]]
name = "market"
version = "0.0.0"
dependencies = [
"cubit",
"dojo",
]

[[package]]
name = "origami"
Expand All @@ -25,3 +33,12 @@ dependencies = [
"cubit",
"dojo",
]

[[package]]
name = "projectile"
version = "0.0.0"
dependencies = [
"cubit",
"dojo",
"origami",
]
19 changes: 13 additions & 6 deletions Scarb.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
[package]
name = "origami"
[workspace]
members = [
"crates",
"examples/*",
]

[workspace.package]
version = "0.0.0"
description = "Community-maintained libraries for Cairo"
homepage = "https://github.com/dojoengine/origami"
authors = [
"[email protected]",
]

[lib]

[dependencies]
[workspace.dependencies]
cubit = { git = "https://github.com/influenceth/cubit", rev = "b459053" }
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v0.3.4" }
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v0.3.6" }
origami = { path = "crates" }
2 changes: 2 additions & 0 deletions crates/Scarb.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Code generated by scarb DO NOT EDIT.
version = 1
10 changes: 10 additions & 0 deletions crates/Scarb.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[package]
name = "origami"
version.workspace = true
authors.workspace = true
description.workspace = true
homepage = "https://github.com/dojoengine/origami/tree/main/crates"

[dependencies]
cubit.workspace = true
dojo.workspace = true
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
43 changes: 0 additions & 43 deletions examples/Scarb.lock

This file was deleted.

13 changes: 0 additions & 13 deletions examples/Scarb.toml

This file was deleted.

2 changes: 1 addition & 1 deletion examples/market/Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ description = "Example of defi crate usage."
homepage = "https://github.com/dojoengine/origami/tree/examples/market"

[dependencies]
cubit = { git = "https://github.com/influenceth/cubit", rev = "b459053" }
cubit.workspace = true
dojo.workspace = true
3 changes: 2 additions & 1 deletion examples/projectile/Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ description = "Example of algebria crate usage."
homepage = "https://github.com/dojoengine/origami/tree/examples/projectile"

[dependencies]
cubit = { git = "https://github.com/influenceth/cubit", rev = "b459053" }
cubit.workspace = true
dojo.workspace = true
origami.workspace = true
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion src/tokens/.gitignore

This file was deleted.