use proper version of llvm

getgems-io · Oct 11, 2023 · 20829e4 · 20829e4
1 parent 48ac1f4
commit 20829e4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/.github/actions/prepare/action.yml b/.github/actions/prepare/action.yml
@@ -6,18 +6,20 @@ runs:
     - uses: dtolnay/rust-toolchain@stable
       with:
         targets: x86_64-unknown-linux-gnu
+    - run: |
+        echo "LLVM_VERSION=$(rustc --verbose --version | grep -Po 'LLVM version: \K\d+')" >> "$GITHUB_OUTPUT"
     - name: Install LLVM and Clang
       shell: bash
       run: |
         wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
-        sudo add-apt-repository "deb http://apt.llvm.org/jammy/  llvm-toolchain-jammy-16 main"
+        sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-$LLVM_VERSION main"
         sudo apt-get update
     - uses: awalsh128/cache-apt-pkgs-action@latest
       with:
-        packages: libsecp256k1-dev libsodium-dev clang-16 lldb-16 lld-16 clangd-16 libc++-16-dev libc++abi-16-dev
+        packages: libsecp256k1-dev libsodium-dev clang-$LLVM_VERSION lldb-$LLVM_VERSION lld-$LLVM_VERSION clangd-$LLVM_VERSION libc++-$LLVM_VERSION-dev libc++abi-$LLVM_VERSION-dev
     - shell: bash
       run: | 
-        sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-16 101
-        sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 101
+        sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-$LLVM_VERSION 101
+        sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-$LLVM_VERSION 101
     - name: Run sccache-cache
-      uses: mozilla-actions/[email protected]
+      uses: mozilla-actions/[email protected]
diff --git a/.github/workflows/ton-grpc-release.yaml b/.github/workflows/ton-grpc-release.yaml
@@ -27,11 +27,11 @@ jobs:
           submodules: recursive
       - uses: ./.github/actions/prepare
       - run: cargo build -v --bin ton-grpc --target x86_64-unknown-linux-gnu --release --features "${{ matrix.features }}"
-#        env:
-#          SCCACHE_GHA_ENABLED: "true"
-#          RUSTC_WRAPPER: "sccache"
-#          CMAKE_C_COMPILER_LAUNCHER: "sccache"
-#          CMAKE_CXX_COMPILER_LAUNCHER: "sccache"
+        env:
+          SCCACHE_GHA_ENABLED: "true"
+          RUSTC_WRAPPER: "sccache"
+          CMAKE_C_COMPILER_LAUNCHER: "sccache"
+          CMAKE_CXX_COMPILER_LAUNCHER: "sccache"
       - run: ldd ./target/x86_64-unknown-linux-gnu/release/ton-grpc
 
       - name: Log in to the Container registry

diff --git a/.github/workflows/tvm-grpc-release.yaml b/.github/workflows/tvm-grpc-release.yaml
@@ -27,11 +27,11 @@ jobs:
           submodules: recursive
       - uses: ./.github/actions/prepare
       - run: cargo build -v --bin tvm-grpc --target x86_64-unknown-linux-gnu --release --features "${{ matrix.features }}"
-#        env:
-#          SCCACHE_GHA_ENABLED: "true"
-#          RUSTC_WRAPPER: "sccache"
-#          CMAKE_C_COMPILER_LAUNCHER: "sccache"
-#          CMAKE_CXX_COMPILER_LAUNCHER: "sccache"
+        env:
+          SCCACHE_GHA_ENABLED: "true"
+          RUSTC_WRAPPER: "sccache"
+          CMAKE_C_COMPILER_LAUNCHER: "sccache"
+          CMAKE_CXX_COMPILER_LAUNCHER: "sccache"
       - run: ldd ./target/x86_64-unknown-linux-gnu/release/tvm-grpc
 
       - name: Log in to the Container registry