Merge branch 'main' into cl/call_gas

Signed-off-by: Cyrill Leutwiler <bigcyrill@hotmail.com>

.github/actions/get-llvm/action.yml

@@ -20,22 +20,24 @@ runs:
       shell: bash
       run: |
         if [ -z "${{ inputs.version }}" ]; then
-          # Get the full version from the LLVM submodule.
+          # Extract branch from .gitmodules (e.g., "release/18.x")
-          git submodule update --init --recursive
+          BRANCH=$(git config -f .gitmodules submodule.llvm.branch)
-          cd llvm
+          if [ -n "$BRANCH" ]; then
-          # Try to get the most recent tag (e.g., "llvmorg-18.1.8")
+            # Extract version from branch name (e.g., "18.x" from "release/18.x")
-          LLVM_TAG=$(git describe --tags --abbrev=0 2>/dev/null)
+            VERSION_PREFIX=$(echo "$BRANCH" | sed 's|release/||' | sed 's|\.x$||')
-          if [ -n "$LLVM_TAG" ]; then
+            echo "Detected LLVM version prefix from submodule branch: $VERSION_PREFIX"
-            echo "Detected LLVM version from submodule: $LLVM_TAG"
+            
-            # Convert "llvmorg-x.y.z" to "llvm-x.y.z"
+            # Special case: pin LLVM 18 to specific version 18.1.8
-            LLVM_VERSION=$(echo "$LLVM_TAG" | sed 's/^llvmorg-/llvm-/')
+            if [ "$VERSION_PREFIX" = "18" ]; then
-            echo "Detected LLVM version from submodule: $LLVM_VERSION"
+              echo "Using pinned version for LLVM 18: llvm-18.1.8"
-            echo "version_prefix=$LLVM_VERSION" >> $GITHUB_OUTPUT
+              echo "version_prefix=llvm-18.1.8" >> $GITHUB_OUTPUT
             else
-            echo "Could not detect LLVM version from submodule, will use latest release"
+              echo "version_prefix=llvm-$VERSION_PREFIX" >> $GITHUB_OUTPUT
+            fi
+          else
+            echo "No branch found in .gitmodules, will use latest release"
             echo "version_prefix=" >> $GITHUB_OUTPUT
           fi
-          cd ..
         else
           echo "Using explicitly provided version: ${{ inputs.version }}"
           echo "version_prefix=${{ inputs.version }}" >> $GITHUB_OUTPUT