chore(cli): Fix path 'duplicate solana-program' check (#4328)

jamie-osec · web-flow · commit f3b2644e9e2a · 2026-03-18T18:57:42.000Z
diff --git a/.github/workflows/reusable-tests.yaml b/.github/workflows/reusable-tests.yaml
@@ -457,6 +457,8 @@ jobs:
             path: tests/auction-house
           - cmd: cd tests/floats && anchor test --skip-lint && npx tsc --noEmit
             path: tests/floats
+          - cmd: cd tests/solana-program-deps && ./test.sh
+            path: tests/solana-program-deps
           - cmd: cd tests/safety-checks && anchor run test
             path: tests/safety-checks
           - cmd: cd tests/custom-coder && anchor test --skip-lint && npx tsc --noEmit
diff --git a/cli/src/checks.rs b/cli/src/checks.rs
@@ -104,7 +104,7 @@ pub fn check_deps(cfg: &WithPath<Config>) -> Result<()> {
         };
         let workspace_toml = cargo_toml::Manifest::from_str(include_str!(concat!(
             env!("CARGO_MANIFEST_DIR"),
-            "/Cargo.toml"
+            "/../Cargo.toml"
         )))
         .unwrap();
         let version = workspace_toml
diff --git a/tests/solana-program-deps/matching/Anchor.toml b/tests/solana-program-deps/matching/Anchor.toml
@@ -0,0 +1,12 @@
+[toolchain]
+
+[features]
+resolution = true
+skip-lint = false
+
+[programs.localnet]
+matching_solana_program = "E9GKQ5qAkB6N4eGK1Bu3R1a6hNFW2W2Kz6fTn6zkRgZN"
+
+[provider]
+cluster = "localnet"
+wallet = "~/.config/solana/id.json"
diff --git a/tests/solana-program-deps/matching/Cargo.toml b/tests/solana-program-deps/matching/Cargo.toml
@@ -0,0 +1,8 @@
+[workspace]
+members = [
+    "programs/*"
+]
+resolver = "2"
+
+[profile.release]
+overflow-checks = true
diff --git a/tests/solana-program-deps/matching/programs/matching-solana-program/Cargo.toml b/tests/solana-program-deps/matching/programs/matching-solana-program/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "matching-solana-program"
+version = "0.1.0"
+description = "Created with Anchor"
+edition = "2018"
+
+[lib]
+crate-type = ["cdylib", "lib"]
+name = "matching_solana_program"
+
+[features]
+no-entrypoint = []
+no-idl = []
+no-log-ix-name = []
+cpi = ["no-entrypoint"]
+default = []
+idl-build = ["anchor-lang/idl-build"]
+
+[dependencies]
+anchor-lang = { path = "../../../../../lang" }
+solana-program = "3.0.0"
diff --git a/tests/solana-program-deps/matching/programs/matching-solana-program/Xargo.toml b/tests/solana-program-deps/matching/programs/matching-solana-program/Xargo.toml
@@ -0,0 +1,2 @@
+[target.bpfel-unknown-unknown.dependencies.std]
+features = []
diff --git a/tests/solana-program-deps/matching/programs/matching-solana-program/src/lib.rs b/tests/solana-program-deps/matching/programs/matching-solana-program/src/lib.rs
@@ -0,0 +1,15 @@
+use anchor_lang::prelude::*;
+
+declare_id!("E9GKQ5qAkB6N4eGK1Bu3R1a6hNFW2W2Kz6fTn6zkRgZN");
+
+#[program]
+pub mod matching_solana_program {
+    use super::*;
+
+    pub fn initialize(_ctx: Context<Initialize>) -> Result<()> {
+        Ok(())
+    }
+}
+
+#[derive(Accounts)]
+pub struct Initialize {}
diff --git a/tests/solana-program-deps/mismatched/Anchor.toml b/tests/solana-program-deps/mismatched/Anchor.toml
@@ -0,0 +1,12 @@
+[toolchain]
+
+[features]
+resolution = true
+skip-lint = false
+
+[programs.localnet]
+mismatched_solana_program = "5vHp6xYFQ4pc6D95P7h3CngkzyP4iMfsMghvYDn8ApXK"
+
+[provider]
+cluster = "localnet"
+wallet = "~/.config/solana/id.json"
diff --git a/tests/solana-program-deps/mismatched/Cargo.toml b/tests/solana-program-deps/mismatched/Cargo.toml
@@ -0,0 +1,8 @@
+[workspace]
+members = [
+    "programs/*"
+]
+resolver = "2"
+
+[profile.release]
+overflow-checks = true
diff --git a/tests/solana-program-deps/mismatched/programs/mismatched-solana-program/Cargo.toml b/tests/solana-program-deps/mismatched/programs/mismatched-solana-program/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "mismatched-solana-program"
+version = "0.1.0"
+description = "Created with Anchor"
+edition = "2018"
+
+[lib]
+crate-type = ["cdylib", "lib"]
+name = "mismatched_solana_program"
+
+[features]
+no-entrypoint = []
+no-idl = []
+no-log-ix-name = []
+cpi = ["no-entrypoint"]
+default = []
+idl-build = ["anchor-lang/idl-build"]
+
+[dependencies]
+anchor-lang = { path = "../../../../../lang" }
+solana-program = "2.3.0"
diff --git a/tests/solana-program-deps/mismatched/programs/mismatched-solana-program/Xargo.toml b/tests/solana-program-deps/mismatched/programs/mismatched-solana-program/Xargo.toml
@@ -0,0 +1,2 @@
+[target.bpfel-unknown-unknown.dependencies.std]
+features = []
diff --git a/tests/solana-program-deps/mismatched/programs/mismatched-solana-program/src/lib.rs b/tests/solana-program-deps/mismatched/programs/mismatched-solana-program/src/lib.rs
@@ -0,0 +1,15 @@
+use anchor_lang::prelude::*;
+
+declare_id!("5vHp6xYFQ4pc6D95P7h3CngkzyP4iMfsMghvYDn8ApXK");
+
+#[program]
+pub mod mismatched_solana_program {
+    use super::*;
+
+    pub fn initialize(_ctx: Context<Initialize>) -> Result<()> {
+        Ok(())
+    }
+}
+
+#[derive(Accounts)]
+pub struct Initialize {}
diff --git a/tests/solana-program-deps/test.sh b/tests/solana-program-deps/test.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+set -euo pipefail
+
+assert_build_warns() {
+  local workspace_dir="$1"
+  local expected_warning="$2"
+  local output
+
+  pushd "$workspace_dir" > /dev/null
+  if ! output=$(anchor build --ignore-keys 2>&1 > /dev/null); then
+    echo "Error: anchor build failed in $workspace_dir"
+    echo "$output"
+    exit 1
+  fi
+  popd > /dev/null
+
+  if [[ "$output" != *"$expected_warning"* ]]; then
+    echo "Error: expected warning in $workspace_dir"
+    echo "$output"
+    exit 1
+  fi
+}
+
+assert_build_succeeds() {
+  local workspace_dir="$1"
+  local unexpected_warning="$2"
+  local output
+
+  pushd "$workspace_dir" > /dev/null
+  if ! output=$(anchor build --ignore-keys 2>&1 > /dev/null); then
+    echo "Error: anchor build failed in $workspace_dir when it should have succeeded"
+    echo "$output"
+    exit 1
+  fi
+  popd > /dev/null
+
+  if [[ -n "$unexpected_warning" && "$output" == *"$unexpected_warning"* ]]; then
+    echo "Error: unexpected warning in $workspace_dir"
+    echo "$output"
+    exit 1
+  fi
+}
+
+warning='Adding `solana-program` as a separate dependency might cause conflicts.'
+
+echo "Checking mismatched solana-program dependency"
+assert_build_warns mismatched "$warning"
+
+echo "Checking matching solana-program dependency"
+assert_build_succeeds matching "$warning"
+
+echo "Success. Solana dependency checks matched expectations."

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[target.bpfel-unknown-unknown.dependencies.std]`
	`2`	`+features = []`