Skip to content

Commit

Permalink
Merge remote-tracking branch 'dojo/main' into pr-1454
Browse files Browse the repository at this point in the history
  • Loading branch information
glihm committed Jan 25, 2024
2 parents bc15cb5 + 2ec18ce commit d74c4df
Show file tree
Hide file tree
Showing 74 changed files with 4,619 additions and 1,398 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/rust
{
"name": "Rust",
"image": "ghcr.io/dojoengine/dojo-dev:136a67a",
"image": "ghcr.io/dojoengine/dojo-dev:5d61184",
"runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/bench.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: benchmark

on:
push:
branches: [main]

permissions:
# deployments permission to deploy GitHub pages website
deployments: write
# contents permission to update benchmark contents in gh-pages branch
contents: write

jobs:
build:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:5d61184
steps:
- uses: actions/checkout@v3
- run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- run: cargo bench --bench codec -- --output-format bencher |sed 1d | tee output.txt
- uses: benchmark-action/github-action-benchmark@v1
with:
tool: "cargo"
output-file-path: output.txt
benchmark-data-dir-path: "."
# Access token to deploy GitHub Pages branch
github-token: ${{ secrets.GITHUB_TOKEN }}
# Push and deploy GitHub pages branch automatically
auto-push: true
alert-threshold: "130%"
comment-on-alert: true
alert-comment-cc-users: "@kariy,@glihm,@tarrencev"
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ jobs:
test:
runs-on: ubuntu-latest-16-cores
container:
image: ghcr.io/dojoengine/dojo-dev:136a67a
image: ghcr.io/dojoengine/dojo-dev:5d61184
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
- run: cargo llvm-cov nextest --all-features --lcov --output-path lcov.info
- uses: codecov/codecov-action@v3
if: github.ref != 'refs/heads/main'
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: lcov.info
fail_ci_if_error: true

ensure-wasm:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:136a67a
image: ghcr.io/dojoengine/dojo-dev:5d61184
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
dojo-core-test:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:136a67a
image: ghcr.io/dojoengine/dojo-dev:5d61184
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -70,7 +70,7 @@ jobs:
dojo-spawn-and-move-example-test:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:136a67a
image: ghcr.io/dojoengine/dojo-dev:5d61184
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -79,7 +79,7 @@ jobs:
dojo-world-bindings-check:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:136a67a
image: ghcr.io/dojoengine/dojo-dev:5d61184
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -88,7 +88,7 @@ jobs:
clippy:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:136a67a
image: ghcr.io/dojoengine/dojo-dev:5d61184
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -97,7 +97,7 @@ jobs:
fmt:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:136a67a
image: ghcr.io/dojoengine/dojo-dev:5d61184
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -106,7 +106,7 @@ jobs:
docs:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:136a67a
image: ghcr.io/dojoengine/dojo-dev:5d61184
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/devcontainer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
propose-update-pr:
needs: build-and-push
runs-on: ubuntu-latest
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
if: (github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event_name == 'create' && startsWith(github.ref, 'refs/tags/'))
permissions:
pull-requests: write
contents: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
contents: write
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:136a67a
image: ghcr.io/dojoengine/dojo-dev:5d61184
steps:
# Workaround described here: https://github.com/actions/checkout/issues/760
- uses: actions/checkout@v3
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ dojo.iml
.env
data
crates/benches/gas_usage.txt
output.txt
Loading

0 comments on commit d74c4df

Please sign in to comment.