Skip to content

Commit

Permalink
Improve version detection
Browse files Browse the repository at this point in the history
  • Loading branch information
federico-terzi committed Aug 1, 2020
1 parent 1c9d360 commit 0c03233
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions ci/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ parameters:

steps:
- script: |
VER=$(cat Cargo.toml| grep version -m 1 | awk -F '"' '{ print $2 }')
VER=$(cat modulo/Cargo.toml| grep version -m 1 | awk -F '"' '{ print $2 }')
echo '##vso[task.setvariable variable=vers]'v$VER
condition: not(eq(variables['Agent.OS'], 'Windows_NT'))
displayName: Obtain version from Cargo.toml on Unix
- powershell: |
Select-String -Path "Cargo.toml" -Pattern "version" | Select-Object -First 1 -outvariable v
Select-String -Path "modulo\Cargo.toml" -Pattern "version" | Select-Object -First 1 -outvariable v
$vv = [regex]::match($v, '"([^"]+)"').Groups[1].Value
echo "##vso[task.setvariable variable=vers]v$vv"
condition: eq(variables['Agent.OS'], 'Windows_NT')
Expand Down
2 changes: 1 addition & 1 deletion modulo-sys/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::path::{Path, PathBuf};

// TODO: add documentation for windows compile
// Go to %WXWIN%/build/msw
// nmake /f makefile.vc BUILD=release TARGET_CPU=X86
// nmake /f makefile.vc BUILD=release TARGET_CPU=X64

// Then install bindgen dependencies:
// https://rust-lang.github.io/rust-bindgen/requirements.html
Expand Down

0 comments on commit 0c03233

Please sign in to comment.