Skip to content

Commit b877a65

Browse files
committed
Merge branch 'main' into fix/my-canister-frontend-fixes
2 parents b912365 + c02bdf6 commit b877a65

4 files changed

Lines changed: 13 additions & 1 deletion

File tree

.github/workflows/shared-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
rust-${{ runner.os }}-${{ hashFiles('rust-toolchain.toml') }}-
4747
4848
- name: Install icp-cli
49-
run: npm install -g @icp-sdk/icp-cli @icp-sdk/ic-wasm
49+
run: npm install -g @icp-sdk/icp-cli@0.2.2 @icp-sdk/ic-wasm
5050

5151
- name: Prefer IPv4 for localhost on runner
5252
run: |

icp.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ networks:
4646
ii: true
4747
gateway:
4848
port: 8080
49+
version: "v12.0.0-2026-03-02-11-09"
4950

5051
environments:
5152
- name: local

scripts/constants.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
export REPO_ROOT
66
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
77

8+
# 🔧 Pinned tool versions
9+
export ICP_CLI_VERSION="0.2.2"
10+
811
# 💰 Cycle amounts
912
export CANISTER_INITIAL_CYCLES="1000000000000"
1013

validate-and-test-all.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ set -euo pipefail
1616

1717
source "$(dirname "$0")/scripts/constants.sh"
1818

19+
# 🔧 Require pinned icp-cli version (must match CI)
20+
CURRENT_ICP_VERSION=$(icp --version 2>/dev/null | awk '{print $2}' || echo "not installed")
21+
if [ "$CURRENT_ICP_VERSION" != "$ICP_CLI_VERSION" ]; then
22+
echo "❌ icp-cli version mismatch: expected ${ICP_CLI_VERSION}, got ${CURRENT_ICP_VERSION}"
23+
echo " Run: npm install -g @icp-sdk/icp-cli@${ICP_CLI_VERSION}"
24+
exit 1
25+
fi
26+
1927
# ⏱️ Per-step timing
2028
SCRIPT_START_TIME=$(date +%s)
2129
T_STATIC=0

0 commit comments

Comments
 (0)