@@ -14,12 +14,39 @@ runs:
1414 - id : extract
1515 shell : bash
1616 run : |
17+ # Debug information
18+ echo "=== Debug Information ==="
19+ echo "Current directory: $(pwd)"
20+ echo "Directory contents:"
21+ ls -la
22+ echo "Looking for anchor.toml..."
23+ find . -name "anchor.toml" || echo "No anchor.toml found in directory tree"
24+ echo "======================="
25+
1726 # Function to extract version from anchor.toml
1827 extract_from_anchor_toml() {
1928 local key=$1
29+ # First try current directory
2030 if [ -f "anchor.toml" ]; then
21- grep "^${key}_version *= *\".*\"" anchor.toml | cut -d'"' -f2
31+ echo "Found anchor.toml in current directory"
32+ version=$(grep "^${key}_version *= *\".*\"" anchor.toml | cut -d'"' -f2)
33+ if [ -n "$version" ]; then
34+ echo "$version"
35+ return 0
36+ fi
37+ # Then try to find it in subdirectories
38+ else
39+ anchor_toml=$(find . -name "anchor.toml" -type f | head -n 1)
40+ if [ -n "$anchor_toml" ]; then
41+ echo "Found anchor.toml at: $anchor_toml"
42+ version=$(grep "^${key}_version *= *\".*\"" "$anchor_toml" | cut -d'"' -f2)
43+ if [ -n "$version" ]; then
44+ echo "$version"
45+ return 0
46+ fi
47+ fi
2248 fi
49+ return 1
2350 }
2451
2552 # Extract Solana version
3259 if [ -n "${SOLANA_VERSION}" ]; then
3360 echo "Detected Solana version from anchor.toml: ${SOLANA_VERSION}"
3461 else
62+ echo "No Solana version found in anchor.toml, checking Cargo.lock..."
3563 # Fallback to Cargo.lock
36- SOLANA_VERSION=$(grep -A 2 'name = "solana-program"' Cargo.lock | grep 'version' | head -n 1 | cut -d'"' -f2)
37- echo "Detected Solana version from Cargo.lock: ${SOLANA_VERSION}"
64+ if [ -f "Cargo.lock" ]; then
65+ SOLANA_VERSION=$(grep -A 2 'name = "solana-program"' Cargo.lock | grep 'version' | head -n 1 | cut -d'"' -f2)
66+ if [ -n "${SOLANA_VERSION}" ]; then
67+ echo "Detected Solana version from Cargo.lock: ${SOLANA_VERSION}"
68+ else
69+ echo "⚠️ No Solana version found in Cargo.lock"
70+ fi
71+ else
72+ echo "⚠️ Cargo.lock not found"
73+ fi
3874 fi
3975 fi
4076 echo "solana_version=${SOLANA_VERSION}" >> $GITHUB_OUTPUT
@@ -50,12 +86,17 @@ runs:
5086 if [ -n "${ANCHOR_VERSION}" ]; then
5187 echo "Detected Anchor version from anchor.toml: ${ANCHOR_VERSION}"
5288 else
89+ echo "No Anchor version found in anchor.toml, checking Cargo.lock..."
5390 # Fallback to Cargo.lock
54- if grep -q 'name = "anchor-lang"' Cargo.lock; then
55- ANCHOR_VERSION=$(grep -A 2 'name = "anchor-lang"' Cargo.lock | grep 'version' | head -n 1 | cut -d'"' -f2)
56- echo "Detected Anchor version from Cargo.lock: ${ANCHOR_VERSION}"
91+ if [ -f "Cargo.lock" ]; then
92+ if grep -q 'name = "anchor-lang"' Cargo.lock; then
93+ ANCHOR_VERSION=$(grep -A 2 'name = "anchor-lang"' Cargo.lock | grep 'version' | head -n 1 | cut -d'"' -f2)
94+ echo "Detected Anchor version from Cargo.lock: ${ANCHOR_VERSION}"
95+ else
96+ echo "⚠️ No Anchor version found in Cargo.lock"
97+ fi
5798 else
58- echo "No Anchor version found in anchor.toml or Cargo.lock"
99+ echo "⚠️ Cargo.lock not found "
59100 fi
60101 fi
61102 fi
0 commit comments