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/multi to single package #4

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
97 changes: 0 additions & 97 deletions .github/workflows/ci.yml

This file was deleted.

58 changes: 58 additions & 0 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Origami Examples CI

on: [push, pull_request]

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

jobs:
check:
runs-on: ubuntu-latest
name: Check format
steps:
- uses: actions/checkout@v4
- uses: software-mansion/setup-scarb@v1
with:
scarb-version: ${{ env.SCARB_VERSION }}
- name: Format
working-directory: ${{ env.WORKING_DIRECTORY }}
run: scarb fmt --check
shell: bash

build:
needs: check
runs-on: ubuntu-latest
name: Build package
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup
- name: Build
working-directory: ${{ env.WORKING_DIRECTORY }}
run: sozo build
shell: bash

market:
needs: [check, build]
runs-on: ubuntu-latest
name: Test 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
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: 42 additions & 0 deletions .github/workflows/origami.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Origami CI

on: [push, pull_request]

env:
DOJO_VERSION: v0.3.4
SCARB_VERSION: v2.3.1

jobs:
check:
runs-on: ubuntu-latest
name: Check format
steps:
- uses: actions/checkout@v4
- uses: software-mansion/setup-scarb@v1
with:
scarb-version: ${{ env.SCARB_VERSION }}
- name: Format
run: scarb fmt --check
shell: bash

build:
needs: check
runs-on: ubuntu-latest
name: Build package
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup
- name: Build
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
shell: bash
40 changes: 2 additions & 38 deletions Scarb.lock
Original file line number Diff line number Diff line change
@@ -1,29 +1,15 @@
# Code generated by scarb DO NOT EDIT.
version = 1

[[package]]
name = "algebra"
version = "0.0.0"
dependencies = [
"cubit",
]

[[package]]
name = "cubit"
version = "1.2.0"
source = "git+https://github.com/influenceth/cubit?rev=b459053#b4590530d5aeae9aabd36740cc2a3d9e6adc5fde"

[[package]]
name = "defi"
version = "0.0.0"
dependencies = [
"cubit",
]

[[package]]
name = "dojo"
version = "0.3.4"
source = "git+https://github.com/dojoengine/dojo.git?tag=v0.3.4#a3140d88b08b79c5ff2261c1db81bafe80b5cc91"
source = "git+https://github.com/dojoengine/dojo?tag=v0.3.4#a3140d88b08b79c5ff2261c1db81bafe80b5cc91"
dependencies = [
"dojo_plugin",
]
Expand All @@ -33,31 +19,9 @@ name = "dojo_plugin"
version = "0.3.4"

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

[[package]]
name = "projectile"
name = "origami"
version = "0.0.0"
dependencies = [
"algebra",
"cubit",
]

[[package]]
name = "random"
version = "0.0.0"
dependencies = [
"dojo",
]

[[package]]
name = "security"
version = "0.0.0"
dependencies = [
"dojo",
]
13 changes: 6 additions & 7 deletions Scarb.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
[workspace]
[package]
name = "origami"
version = "0.0.0"
description = "Community-maintained libraries for Cairo"
homepage = "https://github.com/dojoengine/origami"
members = [
"crates/*",
"examples/*",
]

[workspace.dependencies]
dojo = { git = "https://github.com/dojoengine/dojo.git", tag = "v0.3.4" }
[lib]

[dependencies]
cubit = { git = "https://github.com/influenceth/cubit", rev = "b459053" }
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v0.3.4" }
14 changes: 0 additions & 14 deletions crates/algebra/Scarb.lock

This file was deleted.

8 changes: 0 additions & 8 deletions crates/algebra/Scarb.toml

This file was deleted.

3 changes: 0 additions & 3 deletions crates/algebra/src/lib.cairo

This file was deleted.

27 changes: 0 additions & 27 deletions crates/defi/Scarb.lock

This file was deleted.

8 changes: 0 additions & 8 deletions crates/defi/Scarb.toml

This file was deleted.

6 changes: 0 additions & 6 deletions crates/defi/src/lib.cairo

This file was deleted.

8 changes: 0 additions & 8 deletions crates/random/Scarb.toml

This file was deleted.

2 changes: 0 additions & 2 deletions crates/random/src/lib.cairo

This file was deleted.

8 changes: 0 additions & 8 deletions crates/security/Scarb.toml

This file was deleted.

1 change: 0 additions & 1 deletion crates/security/src/lib.cairo

This file was deleted.

File renamed without changes.
Loading