yume/juniper
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(ci) Fix CI builds

Browse source 
* Update cargo-make
* Quote path on windows
This commit is contained in:
Christian Legnitto 2019-06-24 19:33:09 -07:00 committed by theduke
parent 675f34bc46
commit 6f051f9fcd
3 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.travis.yml
View file

@ -26,15 +26,15 @@ env:
before_script: before_script:
- | - |
if [ "$TRAVIS_OS_NAME" = 'windows' ]; then if [ "$TRAVIS_OS_NAME" = 'windows' ]; then
powershell -executionpolicy bypass -file _build/cargo-make.ps1 -version "0.19.1" -target "x86_64-pc-windows-msvc" powershell -executionpolicy bypass -file _build/cargo-make.ps1 -version "0.20.0" -target "x86_64-pc-windows-msvc"
fi fi
- | - |
if [ "$TRAVIS_OS_NAME" = 'linux' ]; then if [ "$TRAVIS_OS_NAME" = 'linux' ]; then
_build/cargo-make.sh "0.19.1" "x86_64-unknown-linux-musl" _build/cargo-make.sh "0.20.0" "x86_64-unknown-linux-musl"
fi fi
- | - |
if [ "$TRAVIS_OS_NAME" = 'osx' ]; then if [ "$TRAVIS_OS_NAME" = 'osx' ]; then
_build/cargo-make.sh "0.19.1" "x86_64-apple-darwin" _build/cargo-make.sh "0.20.0" "x86_64-apple-darwin"
fi fi
script: script:
- cargo make workspace-ci-flow --no-workspace - cargo make workspace-ci-flow --no-workspace

26
_build/azure-pipelines-template.yml
View file

@ -20,6 +20,7 @@ jobs:
# Linux and macOS. # Linux and macOS.
- script: | - script: |
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUSTUP_TOOLCHAIN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUSTUP_TOOLCHAIN
source /usr/local/cargo/env;
echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin" echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
displayName: Install rust displayName: Install rust
- ${{ if eq(parameters.name, 'Windows') }}: - ${{ if eq(parameters.name, 'Windows') }}:
@ -37,19 +38,32 @@ jobs:
displayName: Query rust and cargo versions displayName: Query rust and cargo versions
- ${{ if eq(parameters.name, 'Linux') }}: - ${{ if eq(parameters.name, 'Linux') }}:
# Linux. # Linux.
- script: _build/cargo-make.sh "0.19.1" "x86_64-unknown-linux-musl" - script: _build/cargo-make.sh "0.20.0" "x86_64-unknown-linux-musl"
displayName: Install cargo-make binary displayName: Install cargo-make binary
- ${{ if eq(parameters.name, 'macOS') }}: - ${{ if eq(parameters.name, 'macOS') }}:
# Mac. # Mac.
- script: _build/cargo-make.sh "0.19.1" "x86_64-apple-darwin" - script: _build/cargo-make.sh "0.20.0" "x86_64-apple-darwin"
displayName: Install cargo-make binary displayName: Install cargo-make binary
- ${{ if eq(parameters.name, 'Windows') }}: - ${{ if eq(parameters.name, 'Windows') }}:
# Windows. # Windows.
- script: powershell -executionpolicy bypass -file _build/cargo-make.ps1 -version "0.19.1" -target "x86_64-pc-windows-msvc" - script: powershell -executionpolicy bypass -file _build/cargo-make.ps1 -version "0.20.0" -target "x86_64-pc-windows-msvc"
displayName: Install cargo-make binary displayName: Install cargo-make binary
- script: cargo make workspace-ci-flow --no-workspace - ${{ if eq(parameters.name, 'Windows') }}:
env: { CARGO_MAKE_RUN_CODECOV: true } # Windows.
displayName: Build and run tests - script: |
set PATH=%PATH%;%USERPROFILE%\.cargo\bin
cargo make workspace-ci-flow --no-workspace
env: { CARGO_MAKE_RUN_CODECOV: true }
displayName: Build and run tests
- ${{ if ne(parameters.name, 'Windows') }}:
# Not Windows.
- script: |
export PATH="$PATH:$HOME/.cargo/bin";
source /usr/local/cargo/env;
cargo make workspace-ci-flow --no-workspace
env: { CARGO_MAKE_RUN_CODECOV: true }
displayName: Build and run tests
- script: | - script: |
rustup target add wasm32-unknown-unknown rustup target add wasm32-unknown-unknown
cargo check --target wasm32-unknown-unknown --package juniper --package juniper_codegen cargo check --target wasm32-unknown-unknown --package juniper --package juniper_codegen

2
azure-pipelines.yml
View file

@ -82,7 +82,7 @@ jobs:
curl https://sh.rustup.rs -sSf | sh -s -- -y curl https://sh.rustup.rs -sSf | sh -s -- -y
displayName: Install stable Rust displayName: Install stable Rust
- script: | - script: |
_build/cargo-make.sh "0.19.1" "x86_64-unknown-linux-musl" _build/cargo-make.sh "0.20.0" "x86_64-unknown-linux-musl"
displayName: Install cargo-make binary displayName: Install cargo-make binary
- script: | - script: |
$HOME/.cargo/bin/cargo install cargo-release $HOME/.cargo/bin/cargo install cargo-release