Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Debug ci #1085

Merged
merged 11 commits into from
Apr 1, 2021
Merged

Debug ci #1085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f6a225d
Add verbose flag (-v) to `cargo vcpkg build`
waych Mar 30, 2021
dd692b2
Try cating failing log
waych Mar 30, 2021
9dd1df5
Do better with the cat
waych Mar 30, 2021
eb0a15b
Let bash do the path translation.
waych Mar 30, 2021
bd022d3
Bump vcpkg to HEAD
waych Mar 30, 2021
53e6446
Restore all oses to debug_ci
waych Mar 30, 2021
340fc5b
Revert "Let bash do the path translation."
waych Mar 30, 2021
f735c38
Revert "Try cating failing log"
waych Mar 30, 2021
9413f11
Update vcpkg to upstream vs2019 fix
waych Mar 30, 2021
9f33c69
Point rust-sdl2 at waych/vcpkg with brotli fix
waych Mar 31, 2021
2917e62
Leave comment describing git path change.
waych Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Install cargo-vcpkg
run: cargo install cargo-vcpkg
- name: Install dependencies
run: cargo vcpkg build
run: cargo vcpkg -v build
- name: Build SDL2
shell: bash
env:
Expand Down
5 changes: 3 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,9 @@ dependencies = ["sdl2"]

# dependencies required when building examples and tests for this crate
dev-dependencies = ["sdl2", "sdl2-image[libjpeg-turbo,tiff,libwebp]", "sdl2-ttf", "sdl2-gfx", "sdl2-mixer"]
git = "https://github.com/microsoft/vcpkg"
rev = "a0518036077baa4"
# TODO: This should be tracking https://github.com/microsoft/vcpkg see #1085
git = "https://github.com/waych/vcpkg"
rev = "14d56fa2da809c5632043041625b975a3ce557bc"

[package.metadata.vcpkg.target]
x86_64-pc-windows-msvc = { triplet = "x64-windows-static-md" }