Skip to content

Commit

Permalink
Merge branch 'main' into esad/renaming-state-transition
Browse files Browse the repository at this point in the history
  • Loading branch information
eyusufatik committed Nov 5, 2024
2 parents b16123e + 63e1db6 commit 3945eaf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/code_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
short_prefix: [0, 1]
ci_test_mode: [0, 1]

steps:
- uses: actions/checkout@v4
Expand All @@ -64,4 +64,4 @@ jobs:
toolchain: stable

- name: Run Cargo test
run: SHORT_PREFIX=${{ matrix.short_prefix }} cargo test
run: CI_TEST_MODE=${{ matrix.ci_test_mode }} cargo test
6 changes: 3 additions & 3 deletions src/config/docker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use crate::{

const DEFAULT_BITCOIN_DOCKER_IMAGE: &str = "bitcoin/bitcoin:28.0";
const DEFAULT_CITREA_DOCKER_IMAGE: &str =
"chainwayxyz/citrea-test:57f9b46a366413f2e5b04a2bca07abcc21ad0dde";
"chainwayxyz/citrea-test:d3a6f5f25175cbfa925ff8fad5069828bd30c06c";

#[derive(Debug)]
pub struct VolumeConfig {
Expand Down Expand Up @@ -76,8 +76,8 @@ where
ports: vec![config.rollup.rpc.bind_port],
image: config.docker_image.clone().unwrap_or_else(|| {
let base_img = DEFAULT_CITREA_DOCKER_IMAGE;
match std::env::var("SHORT_PREFIX") {
Ok(v) if v == "1" || v == "true" => format!("{base_img}-short-prefix"),
match std::env::var("CI_TEST_MODE") {
Ok(v) if v == "1" || v == "true" => format!("{base_img}-ci"),
_ => base_img.to_string(),
}
}),
Expand Down

0 comments on commit 3945eaf

Please sign in to comment.