Fix: Update GitHub Actions workflows to handle Cargo.lock version 4 compatibility

devloai[bot] · devloai[bot] · commit 9d736728a97f · 2025-03-30T09:58:47.000Z
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
@@ -130,9 +130,20 @@ If you encounter Cargo lock file version compatibility issues:
 1. The workflow now explicitly updates Cargo to the latest stable version
 2. We've added a specific step that runs `rustup update stable` and `rustup default stable`
 3. Cargo version is explicitly checked and logged for troubleshooting
-4. The workflow automatically regenerates the Cargo.lock file to ensure it uses a format compatible with the current Cargo version
-5. This ensures compatibility with Cargo.lock version 4 format (used in newer Rust versions)
-6. Any existing Cargo.lock is deleted and freshly regenerated to avoid format conflicts
+4. The workflow now intelligently checks if the installed Cargo version is compatible with Cargo.lock version 4:
+   ```bash
+   CARGO_VERSION=$(cargo --version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
+   MAJOR=$(echo "$CARGO_VERSION" | cut -d'.' -f1)
+   MINOR=$(echo "$CARGO_VERSION" | cut -d'.' -f2)
+   if [ "$MAJOR" -lt 1 ] || ([ "$MAJOR" -eq 1 ] && [ "$MINOR" -lt 70 ]); then
+     # If Cargo is too old, upgrade it again
+     curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable --profile minimal
+   fi
+   ```
+5. The workflow automatically regenerates the Cargo.lock file to ensure it uses a format compatible with the current Cargo version
+6. After regeneration, it explicitly verifies the lock file format with `grep -q 'version = 4' Cargo.lock`
+7. Any existing Cargo.lock is deleted and freshly regenerated to avoid format conflicts
+8. Detailed debugging output is provided if the Cargo.lock generation fails
 
 #### Build Command Not Found
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,13 +29,27 @@ jobs:
 
       - name: Update Cargo to latest stable
         run: |
+          # Update to the latest stable Rust toolchain
           rustup update stable
           rustup default stable
           # Check Cargo version explicitly
           cargo --version
           echo "Using Cargo from: $(which cargo)"
           # Ensure we can handle Cargo.lock version 4
-          echo "Cargo can handle lock version: $(cargo --version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')"
+          CARGO_VERSION=$(cargo --version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
+          echo "Cargo version: $CARGO_VERSION"
+          # Check if Cargo version is new enough for lock file version 4
+          MAJOR=$(echo "$CARGO_VERSION" | cut -d'.' -f1)
+          MINOR=$(echo "$CARGO_VERSION" | cut -d'.' -f2)
+          if [ "$MAJOR" -lt 1 ] || ([ "$MAJOR" -eq 1 ] && [ "$MINOR" -lt 70 ]); then
+            echo "Warning: Cargo version $CARGO_VERSION may not fully support Cargo.lock version 4 format"
+            echo "Attempting to update Cargo again"
+            curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable --profile minimal
+            source "$HOME/.cargo/env"
+            cargo --version
+          else
+            echo "Cargo $CARGO_VERSION supports Cargo.lock version 4 format"
+          fi
 
       - name: Regenerate Cargo.lock
         run: |
@@ -48,6 +62,22 @@ jobs:
           echo "Regenerating Cargo.lock"
           cargo generate-lockfile
           echo "Cargo.lock regenerated successfully"
+          
+          # Verify the Cargo.lock format
+          if [ -f Cargo.lock ]; then
+            echo "Checking Cargo.lock format..."
+            # Quick check to see if it's a version 4 format (contains version = 4)
+            if grep -q 'version = 4' Cargo.lock; then
+              echo "Confirmed: Cargo.lock is using version 4 format"
+            else
+              echo "Warning: Cargo.lock may not be using version 4 format"
+              # For debugging purposes, show the first few lines
+              head -5 Cargo.lock
+            fi
+          else
+            echo "Error: Cargo.lock was not generated!"
+            exit 1
+          fi
 
       - name: Install Solana CLI
         run: |
diff --git a/.github/workflows/tornado_testnet_transaction.yml b/.github/workflows/tornado_testnet_transaction.yml
@@ -70,13 +70,27 @@ jobs:
           
       - name: Update Cargo to latest stable
         run: |
+          # Update to the latest stable Rust toolchain
           rustup update stable
           rustup default stable
           # Check Cargo version explicitly
           cargo --version
           echo "Using Cargo from: $(which cargo)"
           # Ensure we can handle Cargo.lock version 4
-          echo "Cargo can handle lock version: $(cargo --version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')"
+          CARGO_VERSION=$(cargo --version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
+          echo "Cargo version: $CARGO_VERSION"
+          # Check if Cargo version is new enough for lock file version 4
+          MAJOR=$(echo "$CARGO_VERSION" | cut -d'.' -f1)
+          MINOR=$(echo "$CARGO_VERSION" | cut -d'.' -f2)
+          if [ "$MAJOR" -lt 1 ] || ([ "$MAJOR" -eq 1 ] && [ "$MINOR" -lt 70 ]); then
+            echo "Warning: Cargo version $CARGO_VERSION may not fully support Cargo.lock version 4 format"
+            echo "Attempting to update Cargo again"
+            curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable --profile minimal
+            source "$HOME/.cargo/env"
+            cargo --version
+          else
+            echo "Cargo $CARGO_VERSION supports Cargo.lock version 4 format"
+          fi
 
       - name: Regenerate Cargo.lock
         run: |
@@ -89,6 +103,22 @@ jobs:
           echo "Regenerating Cargo.lock"
           cargo generate-lockfile
           echo "Cargo.lock regenerated successfully"
+          
+          # Verify the Cargo.lock format
+          if [ -f Cargo.lock ]; then
+            echo "Checking Cargo.lock format..."
+            # Quick check to see if it's a version 4 format (contains version = 4)
+            if grep -q 'version = 4' Cargo.lock; then
+              echo "Confirmed: Cargo.lock is using version 4 format"
+            else
+              echo "Warning: Cargo.lock may not be using version 4 format"
+              # For debugging purposes, show the first few lines
+              head -5 Cargo.lock
+            fi
+          else
+            echo "Error: Cargo.lock was not generated!"
+            exit 1
+          fi
       
       - name: Setup metrics directory
         run: |
diff --git a/docs/github_actions.md b/docs/github_actions.md
@@ -164,7 +164,20 @@ If your workflow fails with errors about Cargo.lock version compatibility:
    echo "Using Cargo from: $(which cargo)"
    ```
 
-3. **Automatic regeneration:** The workflow automatically regenerates the Cargo.lock file with the correct format:
+3. **Intelligent version checking:** The workflow now determines if the Cargo version is compatible with version 4 lock files:
+   ```bash
+   CARGO_VERSION=$(cargo --version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
+   MAJOR=$(echo "$CARGO_VERSION" | cut -d'.' -f1)
+   MINOR=$(echo "$CARGO_VERSION" | cut -d'.' -f2)
+   if [ "$MAJOR" -lt 1 ] || ([ "$MAJOR" -eq 1 ] && [ "$MINOR" -lt 70 ]); then
+     # If Cargo is too old, upgrade it again
+     curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable --profile minimal
+     source "$HOME/.cargo/env"
+     cargo --version
+   fi
+   ```
+
+4. **Automatic regeneration:** The workflow automatically regenerates the Cargo.lock file with the correct format:
    ```bash
    # Remove any existing Cargo.lock
    if [ -f Cargo.lock ]; then
@@ -174,7 +187,28 @@ If your workflow fails with errors about Cargo.lock version compatibility:
    cargo generate-lockfile
    ```
 
-4. **Compatibility:** These steps ensure compatibility with Cargo.lock version 4 format (used in newer Rust versions)
+5. **Format verification:** The workflow now explicitly verifies the generated Cargo.lock format:
+   ```bash
+   # Verify the Cargo.lock format
+   if [ -f Cargo.lock ]; then
+     echo "Checking Cargo.lock format..."
+     # Quick check to see if it's a version 4 format (contains version = 4)
+     if grep -q 'version = 4' Cargo.lock; then
+       echo "Confirmed: Cargo.lock is using version 4 format"
+     else
+       echo "Warning: Cargo.lock may not be using version 4 format"
+       # For debugging purposes, show the first few lines
+       head -5 Cargo.lock
+     fi
+   else
+     echo "Error: Cargo.lock was not generated!"
+     exit 1
+   fi
+   ```
+
+6. **Compatibility:** These steps ensure compatibility with Cargo.lock version 4 format (used in newer Rust versions, typically Cargo ≥ 1.70.0)
+
+7. **Detailed error reporting:** The workflow provides comprehensive diagnostics about the Cargo version and lock file status
 
 #### Solana Build Command Not Found
 
