Skip to content

Commit

Permalink
Merge pull request #190 from PyO3/bump_nightly
Browse files Browse the repository at this point in the history
Bump to nightly to 2019-08-25
  • Loading branch information
konstin authored Aug 29, 2019
2 parents 7dcf2cb + edcca6d commit 5767aa0
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ matrix:

# Those are run all tests
- os: linux
rust: nightly-2019-05-04
rust: nightly-2019-08-21
env: TARGET=x86_64-unknown-linux-gnu
- os: osx
rust: nightly-2019-05-04
rust: nightly-2019-08-21
env: TARGET=x86_64-apple-darwin

# Run clippy and rustfmt
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ RUN curl https://www.musl-libc.org/releases/musl-1.1.20.tar.gz -o musl.tar.gz \
&& cd .. \
&& rm -rf x86_64-unknown-linux-musl \
&& curl https://sh.rustup.rs -sSf | sh -s -- -y \
&& rustup toolchain add nightly-2019-05-04 \
&& rustup toolchain add nightly-2019-08-21 \
&& rustup target add x86_64-unknown-linux-musl \
&& mkdir /io \
&& python3 -m pip install cffi

ADD . /pyo3-pack/

RUN cargo +nightly-2019-05-04 install --path /pyo3-pack
RUN cargo +nightly-2019-08-21 install --path /pyo3-pack

WORKDIR /io

Expand Down
10 changes: 5 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ environment:
matrix:
# For the integration test
- TARGET: x86_64-pc-windows-msvc
CHANNEL: nightly-2019-05-04
CHANNEL: nightly-2019-08-21
PYTHON: "C:/Python36-x64"

# Publishes to pypi
Expand All @@ -30,10 +30,10 @@ install:
- SET PATH=%PATH%;%CARGO_HOME%\bin

# See https://github.com/PyO3/pyo3/blob/master/ci/appveyor/setup.ps1
- ps: if ($env:channel -like "nightly-2019-05-04") { .\ci\setup.ps1 }
- ps: if ($env:channel -like "nightly-2019-08-21") { .\ci\setup.ps1 }

# From and for ring
- IF "%CHANNEL%" == "nightly-2019-05-04" (call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64)
- IF "%CHANNEL%" == "nightly-2019-08-21" (call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64)

- echo %PATH%
- echo %LIBPATH%
Expand All @@ -42,8 +42,8 @@ install:

test_script:
- cargo build
- IF "%CHANNEL%" == "nightly-2019-05-04" (python.exe -m pip install cffi)
- IF "%CHANNEL%" == "nightly-2019-05-04" (cargo test)
- IF "%CHANNEL%" == "nightly-2019-08-21" (python.exe -m pip install cffi)
- IF "%CHANNEL%" == "nightly-2019-08-21" (cargo test)

before_deploy:
- cargo build --release --features password-storage
Expand Down
4 changes: 2 additions & 2 deletions test-dockerfile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ if [[ $(python test-crates/cffi-mixed/check_installed/check_installed.py) != 'SU
exit 1
fi

docker run --rm -e RUSTUP_TOOLCHAIN=nightly-2019-05-04 -v $(pwd)/test-crates/pyo3-pure:/io pyo3-pack build --no-sdist -i python3.6
docker run --rm -e RUSTUP_TOOLCHAIN=nightly-2019-08-21 -v $(pwd)/test-crates/pyo3-pure:/io pyo3-pack build --no-sdist -i python3.6

pip install pyo3-pure --no-index --find-links test-crates/pyo3-pure/target/wheels/

if [[ $(python test-crates/pyo3-pure/check_installed/check_installed.py) != 'SUCCESS' ]]; then
exit 1
fi

docker run --rm -e RUSTUP_TOOLCHAIN=nightly-2019-05-04 -v $(pwd)/test-crates/pyo3-mixed:/io pyo3-pack build --no-sdist -i python3.6
docker run --rm -e RUSTUP_TOOLCHAIN=nightly-2019-08-21 -v $(pwd)/test-crates/pyo3-mixed:/io pyo3-pack build --no-sdist -i python3.6

pip install pyo3-mixed --no-index --find-links test-crates/pyo3-mixed/target/wheels/

Expand Down

0 comments on commit 5767aa0

Please sign in to comment.