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.

Sign up for GitHub

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

Update devcontainer image: v1.0.0-rc2 #2670

Closed
wants to merge 1 commit into from
Closed

Update devcontainer image: v1.0.0-rc2 #2670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
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:v1.0.0-rc.1",
"image": "ghcr.io/dojoengine/dojo-dev:v1.0.0-rc2",
"runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bench.yml
View file
Open in desktop
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:v1.0.0-rc.1
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc2
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:v1.0.0-rc.1
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc2
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
needs: ensure-docker
runs-on: ubuntu-latest-32-cores
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc.1
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Centralize Docker image version management.

The Docker image version is duplicated across multiple jobs. Consider using a workflow-level environment variable:

 name: ci
 
 env:
   CARGO_TERM_COLOR: always
   RUST_VERSION: 1.79.0
+  DOJO_IMAGE_VERSION: v1.0.0-rc2
 
 jobs:
   test:
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc2
+      image: ghcr.io/dojoengine/dojo-dev:${{ env.DOJO_IMAGE_VERSION }}

Also, consider adding a version verification step:

    - name: Verify Docker image version
      run: |
        if ! docker run --rm ${{ env.DOJO_IMAGE }} cat /version.txt | grep -q "^${{ env.DOJO_IMAGE_VERSION }}$"; then
          echo "Docker image version mismatch"
          exit 1
        fi

Also applies to: 59-59, 126-126, 142-142, 157-157, 166-166, 175-175

steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -56,7 +56,7 @@ jobs:
ensure-wasm:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc.1
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc2
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
needs: build
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc.1
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc2
steps:
- uses: actions/download-artifact@v4
with:
Expand All @@ -139,7 +139,7 @@ jobs:
needs: build
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc.1
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc2
steps:
- uses: actions/download-artifact@v4
with:
Expand All @@ -154,7 +154,7 @@ jobs:
clippy:
runs-on: ubuntu-latest-4-cores
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc.1
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc2
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -163,7 +163,7 @@ jobs:
fmt:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc.1
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc2
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -172,7 +172,7 @@ jobs:
docs:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc.1
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc2
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-dispatch.yml
View file
Open in desktop
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:v1.0.0-rc.1
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc2
env:
VERSION: ""
steps:
Expand Down
Loading