mirror of
https://github.com/mimblewimble/grin-wallet.git
synced 2025-02-01 08:51:09 +03:00
CI Improvements (#166)
* Switch to Windows2019 * Delete Rust install step for Windows and Linux * Add missing indent * Missing indents * Add forgotten LLVM * Fix indents * Fix rust flags
This commit is contained in:
parent
64e8c48c35
commit
5467515d36
2 changed files with 4 additions and 13 deletions
|
@ -1,18 +1,10 @@
|
||||||
steps:
|
steps:
|
||||||
- script: |
|
- script: |
|
||||||
curl -sSf -o rustup-init.exe https://win.rustup.rs
|
|
||||||
rustup-init.exe -y
|
|
||||||
echo "##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin"
|
|
||||||
choco install -y llvm
|
choco install -y llvm
|
||||||
displayName: Windows Install Rust
|
displayName: Windows Install LLVM
|
||||||
condition: eq( variables['Agent.OS'], 'Windows_NT' )
|
condition: eq( variables['Agent.OS'], 'Windows_NT' )
|
||||||
- script: |
|
- script: |
|
||||||
curl https://sh.rustup.rs -sSf | sh -s -- -y
|
curl https://sh.rustup.rs -sSf | sh -s -- -y
|
||||||
echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
|
echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
|
||||||
displayName: macOS Install Rust
|
displayName: macOS Install Rust
|
||||||
condition: eq( variables['Agent.OS'], 'Darwin' )
|
condition: eq( variables['Agent.OS'], 'Darwin' )
|
||||||
- script: |
|
|
||||||
curl https://sh.rustup.rs -sSf | sh -s -- -y
|
|
||||||
echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
|
|
||||||
displayName: Linux Install Rust and Dependencies
|
|
||||||
condition: eq( variables['Agent.OS'], 'Linux' )
|
|
|
@ -25,7 +25,7 @@ pr:
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
RUST_BACKTRACE: '1'
|
RUST_BACKTRACE: '1'
|
||||||
RUST_FLAGS: '-C debug-assertions'
|
RUSTFLAGS: '-C debug-assertions'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
- job: linux
|
- job: linux
|
||||||
|
@ -46,12 +46,11 @@ jobs:
|
||||||
CI_JOB: release
|
CI_JOB: release
|
||||||
PLATFORM: linux-amd64
|
PLATFORM: linux-amd64
|
||||||
steps:
|
steps:
|
||||||
- template: '.ci/install.yml'
|
|
||||||
- template: '.ci/test.yml'
|
- template: '.ci/test.yml'
|
||||||
- template: '.ci/release.yml'
|
- template: '.ci/release.yml'
|
||||||
- job: macos
|
- job: macos
|
||||||
pool:
|
pool:
|
||||||
vmImage: macos-10.13
|
vmImage: macos-10.14
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
test:
|
test:
|
||||||
|
@ -65,7 +64,7 @@ jobs:
|
||||||
- template: '.ci/release.yml'
|
- template: '.ci/release.yml'
|
||||||
- job: windows
|
- job: windows
|
||||||
pool:
|
pool:
|
||||||
vmImage: vs2017-win2016
|
vmImage: windows-2019
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
test:
|
test:
|
||||||
|
|
Loading…
Reference in a new issue