Skip to content

Commit

Permalink
Merge remote-tracking branch 'dojo/main' into dev/add-podman-docker
Browse files Browse the repository at this point in the history
  • Loading branch information
glihm committed Mar 29, 2024
2 parents 165ef79 + 48e7261 commit c553d86
Show file tree
Hide file tree
Showing 35 changed files with 660 additions and 257 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ENV LLVM_SYS_170_PREFIX=/usr/lib/llvm-17
ENV TABLEGEN_170_PREFIX=/usr/lib/llvm-17

# To allow independent workflow of the container, the rust-toolchain is explicitely given.
RUN echo "1.74.0" > rust_toolchain_version
RUN echo "1.76.0" > rust_toolchain_version

# Install cargo-binstall
RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
Expand Down
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:5340720",
"image": "ghcr.io/dojoengine/dojo-dev:8d66222",
"runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
build:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:5340720
image: ghcr.io/dojoengine/dojo-dev:8d66222
steps:
- uses: actions/checkout@v3
- run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ on:

env:
CARGO_TERM_COLOR: always
RUST_VERSION: 1.74.0
RUST_VERSION: 1.76.0

jobs:
test:
runs-on: ubuntu-latest-16-cores
container:
image: nondeterministickari/dojo-dev:cc6554da
image: ghcr.io/dojoengine/dojo-dev:8d66222
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -31,7 +31,7 @@ jobs:
ensure-wasm:
runs-on: ubuntu-latest
container:
image: nondeterministickari/dojo-dev:cc6554da
image: ghcr.io/dojoengine/dojo-dev:8d66222
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
dojo-core-test:
runs-on: ubuntu-latest
container:
image: nondeterministickari/dojo-dev:cc6554da
image: ghcr.io/dojoengine/dojo-dev:8d66222
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -75,7 +75,7 @@ jobs:
dojo-spawn-and-move-example-test:
runs-on: ubuntu-latest
container:
image: nondeterministickari/dojo-dev:cc6554da
image: ghcr.io/dojoengine/dojo-dev:8d66222
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -84,7 +84,7 @@ jobs:
dojo-world-bindings-check:
runs-on: ubuntu-latest
container:
image: nondeterministickari/dojo-dev:cc6554da
image: ghcr.io/dojoengine/dojo-dev:8d66222
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -93,7 +93,7 @@ jobs:
clippy:
runs-on: ubuntu-latest
container:
image: nondeterministickari/dojo-dev:cc6554da
image: ghcr.io/dojoengine/dojo-dev:8d66222
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -102,7 +102,7 @@ jobs:
fmt:
runs-on: ubuntu-latest
container:
image: nondeterministickari/dojo-dev:cc6554da
image: ghcr.io/dojoengine/dojo-dev:8d66222
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -111,7 +111,7 @@ jobs:
docs:
runs-on: ubuntu-latest
container:
image: nondeterministickari/dojo-dev:cc6554da
image: ghcr.io/dojoengine/dojo-dev:8d66222
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:5340720
image: ghcr.io/dojoengine/dojo-dev:8d66222
steps:
# Workaround described here: https://github.com/actions/checkout/issues/760
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
CARGO_TERM_COLOR: always
RUST_VERSION: 1.74.0
RUST_VERSION: 1.76.0
REGISTRY_IMAGE: ghcr.io/${{ github.repository }}

jobs:
Expand Down
Loading

0 comments on commit c553d86

Please sign in to comment.