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

Jump to bottom

fix checkouts of standing data for tests on Windows, enable vcpkg on macOS and Linux #420

Merged
merged 7 commits into from
Aug 18, 2019
Merged

fix checkouts of standing data for tests on Windows, enable vcpkg on macOS and Linux #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
871a185
ensure test reference files are checked out with LF line endings
mcgoo Jul 17, 2019
bf44db9
Do necessary changes to load the dependencies using vcpkg-rs.
crlf0710 Jun 21, 2019
e08094e
add x86_64-pc-windows-msvc build on appveyor
mcgoo Jul 17, 2019
fafece1
.appveyor.yml: (try to) avoid the Windows/MSVC test suite failure
pkgw Aug 8, 2019
17065f6
build.rs: abstract over dep-finding backend more explicitly
pkgw Aug 17, 2019
7167bc6
Fix some `cargo fmt` complaints
pkgw Aug 18, 2019
396d5dd
dist/docker/x86_64-alpine-linux-musl/Dockerfile: add libbz2 to the li…
pkgw Aug 18, 2019
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
34 changes: 19 additions & 15 deletions .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,17 @@
## Operating System (VM environment) ##

# Rust needs at least Visual Studio 2013 Appveyor OS for MSVC targets.
os: Visual Studio 2015
os: Visual Studio 2017

## Build Matrix ##
environment:
matrix:

### MSVC Targets ###
# Stable 64-bit MSVC
# - channel: stable
# toolchain: stable-x86_64-pc-windows-msvc
# target: x86_64-pc-windows-msvc
# target_env: msvc
# mingw_subdir: mingw64
# mingw_target: x86_64-w64-mingw32
# mingw_package_prefix: mingw-w64-x86_64
# Stable 64-bit MSVC
- target: x86_64-pc-windows-msvc
channel: stable
toolchain: stable-x86_64-pc-windows-msvc
target_env: msvc
# Stable 32-bit MSVC
# - channel: stable
# toolchain: stable-i686-pc-windows-msvc
Expand All @@ -29,10 +25,10 @@ environment:
# mingw_package_prefix: mingw-w64-i686

### GNU Targets ###
# Stable 64-bit GNU
- channel: stable
# Stable 64-bit GNU
- target: x86_64-pc-windows-gnu
channel: stable
toolchain: stable-x86_64-pc-windows-msvc
target: x86_64-pc-windows-gnu
target_env: gnu
mingw_subdir: mingw64
mingw_target: x86_64-w64-mingw32
Expand Down Expand Up @@ -72,10 +68,16 @@ install:
- appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
- rustup-init -yv --default-toolchain %channel%-msvc --default-host %target%
- set PATH=%PATH%;%USERPROFILE%\.cargo\bin
- set PATH=C:\msys64\%mingw_subdir%\bin;C:\msys64\usr\bin;%PATH%
- if "%target_env%" == "gnu" set PATH=C:\msys64\%mingw_subdir%\bin;C:\msys64\usr\bin;%PATH%
- rustup target add %target%
- rustup component add rust-src
- pacman -S --noconfirm "%mingw_package_prefix%-fontconfig" "%mingw_package_prefix%-freetype" "%mingw_package_prefix%-icu"
- if "%target_env%" == "gnu" pacman -S --noconfirm "%mingw_package_prefix%-fontconfig" "%mingw_package_prefix%-freetype" "%mingw_package_prefix%-icu"
- if "%target_env%" == "msvc" git clone https://github.com/microsoft/vcpkg %USERPROFILE%\vcpkg
- if "%target_env%" == "msvc" call %USERPROFILE%\vcpkg\bootstrap-vcpkg.bat
- if "%target_env%" == "msvc" %USERPROFILE%\vcpkg\vcpkg install --triplet x64-windows-static fontconfig freetype harfbuzz[icu,graphite2]
- if "%target_env%" == "msvc" set VCPKG_ROOT=%USERPROFILE%\vcpkg
- if "%target_env%" == "msvc" set TECTONIC_DEP_BACKEND=vcpkg
- if "%target_env%" == "msvc" set RUSTFLAGS=-Ctarget-feature=+crt-static
- rustc -vV
- cargo -vV

Expand All @@ -92,6 +94,8 @@ before_test:
# Workaround rust#53454
- if "%target_env%" == "gnu" copy /y "C:\msys64\%mingw_subdir%\%mingw_target%\lib\crt2.o" %USERPROFILE%\.rustup\toolchains\%toolchain%\lib\rustlib\%target%\lib\crt2.o"
- if "%target_env%" == "gnu" copy /y "C:\msys64\%mingw_subdir%\%mingw_target%\lib\dllcrt2.o" %USERPROFILE%\.rustup\toolchains\%toolchain%\lib\rustlib\%target%\lib\dllcrt2.o"
# Dodge format file locking issue in the test suite
- set RUST_TEST_THREADS=1

# Uses 'cargo test' to run tests and build. Alternatively, the project may call compiled programs
# directly or perform other testing commands. Rust will automatically be placed in the PATH
Expand Down
6 changes: 6 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
*.log eol=lf
*.out eol=lf
*.fot eol=lf
*.tex eol=lf
*.bbl eol=lf
*.blg eol=lf
Loading