Merge pull request nervosnetwork#4327 from libraries/update_ckb_vm

chore(scripts): update ckb-vm to v0.24.7
EthanYuan · Jan 31, 2024 · 02aa77f · 02aa77f
2 parents c012030 + 911fd38
commit 02aa77f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/ci_benchmarks_windows.yaml b/.github/workflows/ci_benchmarks_windows.yaml
@@ -57,10 +57,11 @@ jobs:
         iwr -useb get.scoop.sh -outfile 'install-scoop.ps1'
         .\install-scoop.ps1 -RunAsAdmin
         echo "$env:USERPROFILE\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+        echo "C:\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         echo "${{ github.workspace }}\devtools\windows" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         scoop install git
         scoop bucket add extras
-        scoop install llvm yasm
+        scoop install llvm
     - run: |
         if [[ ${{ needs.prologue.outputs.os_skip }} == run ]] && [[ ${{ needs.prologue.outputs.job_skip }} == run ]];then
             devtools/ci/ci_main.sh

diff --git a/.github/workflows/ci_integration_tests_windows.yaml b/.github/workflows/ci_integration_tests_windows.yaml
@@ -61,10 +61,11 @@ jobs:
         iwr -useb get.scoop.sh -outfile 'install-scoop.ps1'
         .\install-scoop.ps1 -RunAsAdmin
         echo "$env:USERPROFILE\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+        echo "C:\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         echo "${{ github.workspace }}\devtools\windows" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         scoop install git
         scoop bucket add extras
-        scoop install llvm yasm
+        scoop install llvm
     - run: |
         if [[ ${{ needs.prologue.outputs.os_skip }} == run ]] && [[ ${{ needs.prologue.outputs.job_skip }} == run ]];then
             devtools/ci/ci_main.sh

diff --git a/.github/workflows/ci_unit_tests_windows.yaml b/.github/workflows/ci_unit_tests_windows.yaml
@@ -57,10 +57,11 @@ jobs:
         iwr -useb get.scoop.sh -outfile 'install-scoop.ps1'
         .\install-scoop.ps1 -RunAsAdmin
         echo "$env:USERPROFILE\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+        echo "C:\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         echo "${{ github.workspace }}\devtools\windows" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         scoop install git
         scoop bucket add extras
-        scoop install llvm yasm
+        scoop install llvm
     - name: Install nextest dependency
       run: scoop install jq
     - name: Install nextest-rs/nextest

diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
@@ -274,7 +274,7 @@ jobs:
         Set-ExecutionPolicy RemoteSigned -scope CurrentUser
         iwr -useb get.scoop.sh -outfile 'install-scoop.ps1'
         .\install-scoop.ps1 -RunAsAdmin
-        scoop install llvm yasm
+        scoop install llvm
         echo ("GIT_TAG_NAME=" + $env:GITHUB_REF.replace('refs/heads/pkg/', '')) >> $env:GITHUB_ENV
         echo "$env:USERPROFILE\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         echo "C:\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/script/Cargo.toml b/script/Cargo.toml
@@ -22,7 +22,7 @@ ckb-traits = { path = "../traits", version = "= 0.114.0-pre" }
 byteorder = "1.3.1"
 ckb-types = { path = "../util/types", version = "= 0.114.0-pre" }
 ckb-hash = { path = "../util/hash", version = "= 0.114.0-pre" }
-ckb-vm = { version = "=0.24.6", default-features = false }
+ckb-vm = { version = "=0.24.7", default-features = false }
 faster-hex = "0.6"
 ckb-logger = { path = "../util/logger", version = "= 0.114.0-pre", optional = true }
 serde = { version = "1.0", features = ["derive"] }