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

ci: windows builds #1770

Merged
merged 3 commits into from
May 13, 2024
Merged

ci: windows builds #1770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9ad7d1
misc: uninstall rust coming from choco
chesedo May 13, 2024
72938a2
refactor: missing beta arg
chesedo May 13, 2024
7c15ff6
misc: restore other ci steps
chesedo May 13, 2024
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
3 changes: 2 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,13 +443,14 @@ jobs:
name: Install Rust
# Note: Let binary build use latest
command: |
choco uninstall rust # The one coming from choco interferes with the one coming from rustup
wget -OutFile "C:\rustup-init.exe" https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe
C:\rustup-init.exe -y --target x86_64-pc-windows-msvc
shell: powershell.exe
- run:
name: Build
command: |
..\.cargo\bin\cargo.exe build --release --package cargo-shuttle --target x86_64-pc-windows-msvc
cargo.exe build --release --package cargo-shuttle --target x86_64-pc-windows-msvc
shell: powershell.exe
- make-artifact:
target: x86_64-pc-windows-msvc
Expand Down
2 changes: 1 addition & 1 deletion cargo-shuttle/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1675,7 +1675,7 @@ impl Shuttle {
let mut signal_received = false;
for (i, service) in services.iter().enumerate() {
signal_received = tokio::select! {
res = Shuttle::spin_local_runtime(&run_args, service, i as u16) => {
res = Shuttle::spin_local_runtime(self.beta, &run_args, service, i as u16) => {
Shuttle::add_runtime_info(res.unwrap(), &mut runtimes).await?;
false
},
Expand Down