diff --git a/.github/workflows/ci_benchmarks_windows.yaml b/.github/workflows/ci_benchmarks_windows.yaml index 901127e54c..94c54c94db 100644 --- 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 index 3c2306606c..c59c12078c 100644 --- 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 index 133de938bc..97bfd92e6f 100644 --- 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 index 9a9c553cc1..bc068da1e8 100644 --- 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 index 3d748e9b20..125265a764 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1656,9 +1656,9 @@ dependencies = [ [[package]] name = "ckb-vm" -version = "0.24.6" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc004a826b9bc9319ffae0b8415690e1b5f1482266d55fbd43843aa40ddcd63" +checksum = "816e61367594b83f86d6100d1c940a62658f364fcfb8e81f2296440ebcb6e28e" dependencies = [ "byteorder", "bytes", @@ -1674,9 +1674,9 @@ dependencies = [ [[package]] name = "ckb-vm-definitions" -version = "0.24.6" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ced3ff9d79b53d93c106720f6c1f855694290e33581850e05c859500eee83f" +checksum = "bd940885b250d3bc14b1d2b9fb45ceafdc857b2c5c43610cf9bf944f08dc511f" dependencies = [ "paste", ] diff --git a/script/Cargo.toml b/script/Cargo.toml index 8c46b6a0fd..d418f78eca 100644 --- 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"] }