fix: add proper python in msys2 env, add boost

matter-labs · Sep 10, 2024 · 2b3ceac · 2b3ceac
1 parent 51218c4
commit 2b3ceac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/actions/build-llvm/action.yml b/.github/actions/build-llvm/action.yml
@@ -51,7 +51,7 @@ inputs:
   llvm-builder-version:
     description: 'Version of the LLVM builder to use.'
     required: false
-    default: '1.0.32'
+    default: '1.0.33'
   ccache-key:
     description: 'Github Actions cache key for CCache.'
     required: false
@@ -158,5 +158,6 @@ runs:
         if [[ -n "${{ inputs.default-target-triple }}" && "${{ inputs.default-target-triple }}" != "default" ]]; then
           DEFAULT_TARGET="--default-target ${{ inputs.default-target-triple }}"
         fi
+
         zksync-llvm build --target-env ${{ inputs.target-env }} ${DEFAULT_TARGET} \
           --use-ccache ${{ inputs.builder-extra-args }} ${DEBUG_ARG} ${ENABLE_TESTS} ${ENABLE_VALGRIND} ${ENABLE_ASSERTIONS} ${ENABLE_COVERAGE} ${SANITIZER} ${EXTRA_ARGS}
diff --git a/.github/actions/prepare-msys/action.yml b/.github/actions/prepare-msys/action.yml
@@ -6,7 +6,7 @@ runs:
   - name: Setup msys2
     uses: msys2/setup-msys2@v2
     with:
-      path-type: inherit # Important to correctly update PATH
+      path-type: strict # Important to correctly update PATH
       install: >-
         base-devel
         git
@@ -17,7 +17,10 @@ runs:
         mingw-w64-x86_64-cmake
         mingw-w64-x86_64-gcc
         mingw-w64-x86_64-gcc-libs
+        mingw-w64-x86_64-python
+        mingw-w64-x86_64-boost
 
   - name: Prepare env
     shell: 'msys2 {0}'
-    run: echo "/c/Users/runneradmin/.cargo/bin" >> "${GITHUB_PATH}"
+    run: |
+      echo "export PATH=/c/Users/runneradmin/.cargo/bin:/mingw64/bin:/usr/bin:/usr/local/bin" >> ${HOME}/.bash_profile