Skip to content

Commit

Permalink
Merge branch 'main' into strict-indexing
Browse files Browse the repository at this point in the history
  • Loading branch information
glihm authored Jan 30, 2025
2 parents 06b0791 + 91da65d commit 506399a
Show file tree
Hide file tree
Showing 88 changed files with 10,633 additions and 6,881 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:b37b325",
"image": "ghcr.io/dojoengine/dojo-dev:v1.1.1",
"runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
Expand Down
1 change: 0 additions & 1 deletion .github/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@ WORKDIR /
COPY --from=builder /app/target/release/katana /app/artifacts/
COPY --from=builder /app/target/release/torii /app/artifacts/
COPY --from=builder /app/target/release/sozo /app/artifacts/
COPY --from=builder /app/target/release/saya /app/artifacts/
4 changes: 2 additions & 2 deletions .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
bench-katana:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:b37b325
image: ghcr.io/dojoengine/dojo-dev:v1.1.1
steps:
- uses: actions/checkout@v3
- run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
Expand All @@ -36,7 +36,7 @@ jobs:
bench-sozo:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:b37b325
image: ghcr.io/dojoengine/dojo-dev:v1.1.1
steps:
- uses: actions/checkout@v3
- run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest-4-cores
needs: [fmt, cairofmt]
container:
image: ghcr.io/dojoengine/dojo-dev:b37b325
image: ghcr.io/dojoengine/dojo-dev:v1.1.1
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -34,7 +34,7 @@ jobs:
needs: ensure-docker
runs-on: ubuntu-latest-32-cores
container:
image: ghcr.io/dojoengine/dojo-dev:b37b325
image: ghcr.io/dojoengine/dojo-dev:v1.1.1
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -60,7 +60,7 @@ jobs:
runs-on: ubuntu-latest
needs: [fmt, cairofmt]
container:
image: ghcr.io/dojoengine/dojo-dev:b37b325
image: ghcr.io/dojoengine/dojo-dev:v1.1.1
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
needs: build
runs-on: ubuntu-latest
container:
image: ubuntu:noble
image: debian:bookworm-slim
steps:
- uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
runs-on: ubuntu-latest-4-cores
needs: [fmt, cairofmt]
container:
image: ghcr.io/dojoengine/dojo-dev:b37b325
image: ghcr.io/dojoengine/dojo-dev:v1.1.1
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -173,7 +173,7 @@ jobs:
fmt:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:b37b325
image: ghcr.io/dojoengine/dojo-dev:v1.1.1
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -183,7 +183,7 @@ jobs:
runs-on: ubuntu-latest
needs: [fmt, cairofmt]
container:
image: ghcr.io/dojoengine/dojo-dev:b37b325
image: ghcr.io/dojoengine/dojo-dev:v1.1.1
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
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:b37b325
image: ghcr.io/dojoengine/dojo-dev:v1.1.1
env:
VERSION: ""
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

env:
CARGO_TERM_COLOR: always
RUST_VERSION: 1.80.0
RUST_VERSION: 1.81.0
REGISTRY_IMAGE: ghcr.io/${{ github.repository }}

jobs:
Expand Down
Loading

0 comments on commit 506399a

Please sign in to comment.