fix: photon cache invalidation for local dev (#2109)

* fix: improve photon cache invalidation for local dev

- Track both version AND commit in install log (photon:version:commit)
- Validate PHOTON_VERSION and PHOTON_COMMIT are set before install
- Use portable sed -i for macOS/Linux compatibility
- Clean up old log entries when version/commit changes
- Verify binary exists after installation
- Add --force to CLI install message suggestions
- Update VERSIONS array in shared.sh to track commit

* add workflow_dispatch for forester-tests

Author: SwenSchaeferjohann

.github/workflows/forester-tests.yml

@@ -4,6 +4,7 @@ permissions:
   contents: read
 
 on:
+  workflow_dispatch:
   push:
     branches: [main]
     paths:

cli/src/utils/processPhotonIndexer.ts

@@ -28,11 +28,11 @@ async function isExpectedPhotonVersion(
 
 function getPhotonInstallMessage(): string {
   if (USE_PHOTON_FROM_GIT && PHOTON_GIT_COMMIT) {
-    return `\nLatest Photon indexer not found. Please install it by running: "cargo install --git ${PHOTON_GIT_REPO} --rev ${PHOTON_GIT_COMMIT} --locked"`;
+    return `\nPhoton indexer ${PHOTON_VERSION} (commit ${PHOTON_GIT_COMMIT}) not found. Please install it by running: "cargo install --git ${PHOTON_GIT_REPO} --rev ${PHOTON_GIT_COMMIT} --locked --force"`;
   } else if (USE_PHOTON_FROM_GIT) {
-    return `\nLatest Photon indexer not found. Please install it by running: "cargo install --git ${PHOTON_GIT_REPO} --locked"`;
+    return `\nPhoton indexer ${PHOTON_VERSION} not found. Please install it by running: "cargo install --git ${PHOTON_GIT_REPO} --locked --force"`;
   } else {
-    return `\nLatest Photon indexer not found. Please install it by running: "cargo install photon-indexer --version ${PHOTON_VERSION} --locked"`;
+    return `\nPhoton indexer ${PHOTON_VERSION} not found. Please install it by running: "cargo install photon-indexer --version ${PHOTON_VERSION} --locked --force"`;
   }
 }
 

scripts/devenv/install-photon.sh

@@ -4,33 +4,59 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${SCRIPT_DIR}/shared.sh"
 
 install_photon() {
-    local expected_version=$(get_version "photon")
-    local photon_installed=false
-    local photon_correct_version=false
+    local expected_version="${PHOTON_VERSION}"
+    local expected_commit="${PHOTON_COMMIT}"
+    local install_marker="photon:${expected_version}:${expected_commit}"
+
+    # Validate required variables
+    if [ -z "${expected_version}" ] || [ -z "${expected_commit}" ]; then
+        echo "ERROR: PHOTON_VERSION or PHOTON_COMMIT not set in versions.sh"
+        exit 1
+    fi
 
     export CARGO_HOME="${PREFIX}/cargo"
     export PATH="${PREFIX}/cargo/bin:${PATH}"
 
-    if ! is_installed "photon"; then
-        if [ -f "${PREFIX}/cargo/bin/photon" ]; then
-            photon_installed=true
-            if photon_version=$(${PREFIX}/cargo/bin/photon --version 2>/dev/null); then
-                if echo "$photon_version" | grep -q "$expected_version"; then
-                    photon_correct_version=true
-                fi
-            fi
-        fi
+    # Ensure directories and log file exist
+    mkdir -p "${PREFIX}/cargo/bin"
+    touch "$INSTALL_LOG"
 
-        if [ "$photon_installed" = false ] || [ "$photon_correct_version" = false ]; then
-            echo "Installing Photon indexer (version $expected_version)..."
-            RUSTFLAGS="-A dead-code" cargo install --git https://github.com/helius-labs/photon.git --rev ${PHOTON_COMMIT} --locked --force
-            log "photon"
+    # Portable sed -i (macOS vs Linux)
+    sed_inplace() {
+        if [[ "$OSTYPE" == "darwin"* ]]; then
+            sed -i '' "$@"
         else
-            echo "Photon already installed with correct version, skipping..."
+            sed -i "$@"
+        fi
+    }
+
+    # Check if exact version+commit combo is already installed
+    if grep -q "^${install_marker}$" "$INSTALL_LOG" 2>/dev/null; then
+        # Double-check binary actually exists
+        if [ -f "${PREFIX}/cargo/bin/photon" ]; then
+            echo "Photon ${expected_version} (commit ${expected_commit}) already installed, skipping..."
+            return 0
         fi
-    else
-        echo "Photon already installed with correct version, skipping..."
+        # Binary missing despite log entry - remove stale log entry
+        sed_inplace "/^photon:/d" "$INSTALL_LOG" 2>/dev/null || true
+    fi
+
+    # Remove any old photon entries from log (different version/commit)
+    sed_inplace "/^photon:/d" "$INSTALL_LOG" 2>/dev/null || true
+    sed_inplace "/^photon$/d" "$INSTALL_LOG" 2>/dev/null || true
+
+    echo "Installing Photon indexer ${expected_version} (commit ${expected_commit})..."
+    RUSTFLAGS="-A dead-code" cargo install --git https://github.com/helius-labs/photon.git --rev ${expected_commit} --locked --force
+
+    # Verify installation succeeded
+    if [ ! -f "${PREFIX}/cargo/bin/photon" ]; then
+        echo "ERROR: Photon installation failed - binary not found"
+        exit 1
     fi
+
+    # Log the exact version+commit installed
+    echo "${install_marker}" >> "$INSTALL_LOG"
+    echo "Photon ${expected_version} (commit ${expected_commit}) installed successfully"
 }
 
 install_photon

scripts/devenv/shared.sh

@@ -18,7 +18,7 @@ VERSIONS=(
     "solana:${SOLANA_VERSION}"
     "anchor:${ANCHOR_VERSION}"
     "jq:${JQ_TAG}"
-    "photon:${PHOTON_VERSION}"
+    "photon:${PHOTON_VERSION}:${PHOTON_COMMIT}"
     "redis:${REDIS_VERSION}"
 )