Miscellaneous changes #266
4 changed files with 36 additions and 23 deletions
|
@ -15,10 +15,14 @@ jobs:
|
||||||
- template: ci/azure-test-all.yml
|
- template: ci/azure-test-all.yml
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
stable:
|
stable-x86_64-msvc:
|
||||||
TOOLCHAIN: stable
|
TOOLCHAIN: stable-x86_64-pc-windows-msvc
|
||||||
nightly:
|
# stable-x86_64-gnu:
|
||||||
TOOLCHAIN: nightly
|
# TOOLCHAIN: stable-x86_64-pc-windows-gnu
|
||||||
|
# stable-i686-msvc:
|
||||||
|
# TOOLCHAIN: stable-i686-pc-windows-msvc
|
||||||
|
# stable-i686-gnu:
|
||||||
|
# TOOLCHAIN: stable-i686-pc-windows-gnu
|
||||||
|
|
||||||
- job: Linux
|
- job: Linux
|
||||||
pool:
|
pool:
|
||||||
|
@ -28,9 +32,11 @@ jobs:
|
||||||
- template: ci/azure-test-all.yml
|
- template: ci/azure-test-all.yml
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
stable:
|
stable-x86_64:
|
||||||
TOOLCHAIN: stable
|
TOOLCHAIN: stable-x86_64-unknown-linux-gnu
|
||||||
nightly:
|
# stable-i686:
|
||||||
|
# TOOLCHAIN: stable-i686-unknown-linux-gnu
|
||||||
|
nightly-x86_64:
|
||||||
TOOLCHAIN: nightly
|
TOOLCHAIN: nightly
|
||||||
|
|
||||||
- job: MacOS
|
- job: MacOS
|
||||||
|
@ -41,7 +47,5 @@ jobs:
|
||||||
- template: ci/azure-test-all.yml
|
- template: ci/azure-test-all.yml
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
stable:
|
stable-x86_64:
|
||||||
TOOLCHAIN: stable
|
TOOLCHAIN: stable-x86_64-apple-darwin
|
||||||
nightly:
|
|
||||||
TOOLCHAIN: nightly
|
|
9
build.rs
9
build.rs
|
@ -63,6 +63,11 @@ fn main() {
|
||||||
buildcmd.current_dir(&src_dir);
|
buildcmd.current_dir(&src_dir);
|
||||||
buildcmd.stderr(Stdio::inherit());
|
buildcmd.stderr(Stdio::inherit());
|
||||||
|
|
||||||
|
if cfg!(target_pointer_width = "32") {
|
||||||
|
buildcmd.env("HOST_CC", "gcc -m32");
|
||||||
|
buildcmd.arg("-e");
|
||||||
|
}
|
||||||
|
|
||||||
let mut child = buildcmd.spawn().expect("failed to run make");
|
let mut child = buildcmd.spawn().expect("failed to run make");
|
||||||
|
|
||||||
if !child
|
if !child
|
||||||
|
@ -77,4 +82,8 @@ fn main() {
|
||||||
println!("cargo:rustc-link-search=native={}", src_dir);
|
println!("cargo:rustc-link-search=native={}", src_dir);
|
||||||
println!("cargo:rustc-link-lib=static=luajit");
|
println!("cargo:rustc-link-lib=static=luajit");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// if cfg!(target_os = "macos") && cfg!(target_pointer_width = "64") {
|
||||||
|
// // RUSTFLAGS='-C link-args=-pagezero_size 10000 -image_base 100000000'
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,19 +7,9 @@ steps:
|
||||||
rustup --version
|
rustup --version
|
||||||
displayName: Install rustup
|
displayName: Install rustup
|
||||||
condition: eq(variables['Agent.OS'], 'Darwin')
|
condition: eq(variables['Agent.OS'], 'Darwin')
|
||||||
# - script: |
|
|
||||||
# echo %TOOLCHAIN%
|
|
||||||
# curl -sSf -o rustup-init.exe https://win.rustup.rs
|
|
||||||
# rustup-init.exe -v -y --default-toolchain %TOOLCHAIN%
|
|
||||||
# echo ##vso[task.prependpath]%USERPROFILE%\.cargo\bin
|
|
||||||
# rustup default %TOOLCHAIN%
|
|
||||||
# rustup component add rustfmt
|
|
||||||
# displayName: Install rust (windows)
|
|
||||||
# condition: eq(variables['Agent.OS'], 'Windows_NT')
|
|
||||||
- bash: |
|
- bash: |
|
||||||
set -x
|
set -e -x
|
||||||
rustup --version
|
rustup --version
|
||||||
rustup component remove --toolchain $TOOLCHAIN rust-docs || true
|
|
||||||
rustup default $TOOLCHAIN
|
rustup default $TOOLCHAIN
|
||||||
rustup update --no-self-update $TOOLCHAIN
|
rustup update --no-self-update $TOOLCHAIN
|
||||||
rustup toolchain install stable
|
rustup toolchain install stable
|
||||||
|
|
|
@ -1,6 +1,16 @@
|
||||||
steps:
|
steps:
|
||||||
- checkout: self
|
- checkout: self
|
||||||
submodules: true
|
submodules: true
|
||||||
|
# - script: |
|
||||||
|
# call "C:\Program Files (x86)\Microsoft Visual Studio\2017\VC\Auxiliary\Build\vcvarsall.bat" x86
|
||||||
|
# displayName: Call vcvarsalls.bat x86
|
||||||
|
# condition: eq(variables['TOOLCHAIN'], 'stable-i686-pc-windows-msvc')
|
||||||
|
# - bash: pacman -Syu
|
||||||
|
# condition: eq(variables['TOOLCHAIN'], 'stable-x86_64-pc-windows-gnu')
|
||||||
|
# displayName: Update msys
|
||||||
|
# - bash: sudo apt install gcc-multilib
|
||||||
|
# condition: eq(variables['TOOLCHAIN'], 'stable-i686-unknown-linux-gnu')
|
||||||
|
# displayName: Install gcc-multilib
|
||||||
- bash: |
|
- bash: |
|
||||||
set -e -x
|
set -e -x
|
||||||
cargo +stable fmt --all -- --check
|
cargo +stable fmt --all -- --check
|
||||||
|
@ -22,5 +32,5 @@ steps:
|
||||||
- bash: |
|
- bash: |
|
||||||
pwd
|
pwd
|
||||||
find ./target
|
find ./target
|
||||||
displayName: List files in ./target
|
displayName: List files in target
|
||||||
condition: always()
|
condition: always()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue