Skip to content

Commit

Permalink
Update to windows-sys 0.52 (#7632)
Browse files Browse the repository at this point in the history
* windows-sys 0.52

Not locally tested due to C dependencies which I don't have the tooling for.
The intent is to use GH's CI.

* MEMORYMAPPEDVIEW_HANDLE -> MEMORY_MAPPED_VIEW_ADDRESS

* .Value instead of cast

* fmt

* Remove cast to MEMORY_MAPPED_VIEW_ADDRESS with struct creation

* Cast ptr from *mut u8 from *mut void

* Remove CI changes which were supposed to be on a distinct branch

* Update binutils when the target is x86_64-pc-windows-gnu

* Escape paths in CI

* Update .github/workflows/main.yml

Co-authored-by: Chris Denton <christophersdenton@gmail.com>

* Correct type from p2sh to pwsh

* Use | to correct YAML parsing error

* Fix msys2's installation of MinGW

* Finally fix msys2 handling

---------

Co-authored-by: Chris Denton <christophersdenton@gmail.com>
  • Loading branch information
kayabaNerve and ChrisDenton authored Dec 17, 2023
1 parent 54d3727 commit e4ce5a5
Show file tree
Hide file tree
Showing 4 changed files with 115 additions and 37 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,13 @@ jobs:
- run: echo CFLAGS=-g0 >> $GITHUB_ENV
if: matrix.target == 'x86_64-pc-windows-gnu'

# Update binutils if MinGW due to https://github.com/rust-lang/rust/issues/112368
- run: C:/msys64/usr/bin/pacman.exe -Syu --needed mingw-w64-x86_64-gcc --noconfirm
if: matrix.target == 'x86_64-pc-windows-gnu'
- shell: pwsh
run: echo "C:\msys64\mingw64\bin" >> $Env:GITHUB_PATH
if: matrix.target == 'x86_64-pc-windows-gnu'

- run: cargo fetch --locked

- uses: actions/cache@v3
Expand Down
134 changes: 100 additions & 34 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ wit-component = "0.19.0"
object = { version = "0.32", default-features = false, features = ['read_core', 'elf', 'std'] }
gimli = { version = "0.28.0", default-features = false, features = ['read', 'std'] }
anyhow = "1.0.22"
windows-sys = "0.48.0"
windows-sys = "0.52.0"
env_logger = "0.10"
log = { version = "0.4.8", default-features = false }
clap = { version = "4.3.12", default-features = false, features = ["std", "derive"] }
Expand Down
Loading

0 comments on commit e4ce5a5

Please sign in to comment.