Skip to content

Commit

Permalink
merge dojo/main
Browse files Browse the repository at this point in the history
  • Loading branch information
glihm committed Jan 4, 2024
2 parents a62754e + 37f41d5 commit 70747dc
Show file tree
Hide file tree
Showing 103 changed files with 1,620 additions and 3,231 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ jobs:
# The target is used by Cargo
# The arch is either 386, arm64 or amd64
# The svm target platform to use for the binary https://github.com/roynalnaruto/svm-rs/blob/84cbe0ac705becabdc13168bae28a45ad2299749/svm-builds/build.rs#L4-L24
- os: ubuntu-latest-4-cores
- os: ubuntu-20.04-4-cores
platform: linux
target: x86_64-unknown-linux-gnu
arch: amd64
- os: ubuntu-latest-8-cores
- os: ubuntu-20.04-8-cores
platform: linux
target: aarch64-unknown-linux-gnu
arch: arm64
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
retention-days: 1

create-draft-release:
runs-on: ubuntu-latest-4-cores
runs-on: ubuntu-20.04-4-cores
needs: [prepare, release]
env:
GITHUB_USER: ${{ github.repository_owner }}
Expand All @@ -165,7 +165,7 @@ jobs:
- run: gh release create v${{ steps.version_info.outputs.version }} ./artifacts/*.gz --generate-notes --draft

docker-build-and-push:
runs-on: ubuntu-latest-4-cores
runs-on: ubuntu-20.04-4-cores
needs: [prepare, release]

steps:
Expand Down
84 changes: 49 additions & 35 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ members = [
"crates/dojo-test-utils",
"crates/dojo-types",
"crates/dojo-world",
"crates/dojo-world/abigen",
"crates/katana",
"crates/katana/core",
"crates/katana/executor",
Expand All @@ -35,7 +36,7 @@ edition = "2021"
license = "Apache-2.0"
license-file = "LICENSE"
repository = "https://github.com/dojoengine/dojo/"
version = "0.4.2"
version = "0.4.4"

[profile.performance]
codegen-units = 1
Expand Down
2 changes: 1 addition & 1 deletion crates/dojo-core/Scarb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version = 1

[[package]]
name = "dojo"
version = "0.4.2"
version = "0.4.4"
dependencies = [
"dojo_plugin",
]
Expand Down
Loading

0 comments on commit 70747dc

Please sign in to comment.