Skip to content

Commit

Permalink
Temporarily pin nightly version used for builds
Browse files Browse the repository at this point in the history
In the most recent nightly build of cargo a regression slipped in around
handling of READMEs in published crates [1]. Unfortunately this breaks CI
builds because a 3rd level dependency (pyo3->inventory->ctor) triggers
this regression. The issue has been corrected in cargo and the next
nightly should fix this. However, to unblock things in the meantime this
commit pins the nightly version to a known working version. We can
simply revert this after the fix has been released.

[1] rust-lang/cargo#8351
  • Loading branch information
mtreinish committed Jun 12, 2020
1 parent 5f53f3d commit 98e4e2e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
install: echo ""
before_script:
- rustup update
- rustup override set nightly
- rustup override set nightly-2020-06-10
script:
- cargo build
- cargo +stable fmt -- --check
Expand Down
14 changes: 7 additions & 7 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ stages:
pool: {vmImage: 'macOS-10.15'}
variables:
python.version: '3.7'
CIBW_BEFORE_BUILD: pip install -U setuptools-rust && rustup default nightly
CIBW_BEFORE_BUILD: pip install -U setuptools-rust && rustup default nightly-2020-06-10
CIBW_SKIP: cp27-* cp34-* pp*
TWINE_USERNAME: retworkx-ci
CIBW_TEST_COMMAND: python -m unittest discover {project}/tests
Expand All @@ -43,7 +43,7 @@ stages:
pool: {vmImage: 'vs2017-win2016'}
condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
variables:
CIBW_BEFORE_BUILD: rustup default nightly && pip install -U setuptools-rust
CIBW_BEFORE_BUILD: rustup default nightly-2020-06-10 && pip install -U setuptools-rust
CIBW_SKIP: cp27-* cp34-* pp* *win32
TWINE_USERNAME: retworkx-ci
CIBW_TEST_COMMAND: python -m unittest discover {project}/tests
Expand All @@ -65,7 +65,7 @@ stages:
pool: {vmImage: 'vs2017-win2016'}
condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
variables:
CIBW_BEFORE_BUILD: rustup default nightly-i686-pc-windows-msvc && pip install -U setuptools-rust
CIBW_BEFORE_BUILD: rustup default nightly-i686-pc-windows-msvc-2020-06-10 && pip install -U setuptools-rust
CIBW_SKIP: cp27-* cp34-* pp* *amd64
TWINE_USERNAME: retworkx-ci
CIBW_TEST_COMMAND: python -m unittest discover {project}/tests
Expand Down Expand Up @@ -100,7 +100,7 @@ stages:
inputs:
versionSpec: '$(python.version)'
displayName: 'Use Python $(python.version)'
- bash: rustup default nightly
- bash: rustup default nightly-2020-06-10
displayName: 'Install Rust'
- bash: python -m pip install --upgrade pip setuptools virtualenv setuptools-rust
displayName: 'Install dependencies'
Expand All @@ -126,7 +126,7 @@ stages:
inputs:
versionSpec: '$(python.version)'
displayName: 'Use Python $(python.version)'
- bash: rustup default nightly
- bash: rustup default nightly-2020-06-10
displayName: 'Install Rust'
- bash: |
set -e
Expand Down Expand Up @@ -165,7 +165,7 @@ stages:
inputs:
versionSpec: '$(python.version)'
displayName: 'Use Python $(python.version)'
- bash: rustup default nightly
- bash: rustup default nightly-2020-06-10
displayName: 'Install Rust'
- bash: python -m pip install --upgrade pip setuptools virtualenv setuptools-rust
displayName: 'Install dependencies'
Expand Down Expand Up @@ -195,7 +195,7 @@ stages:
inputs:
versionSpec: '$(python.version)'
displayName: 'Use Python $(python.version)'
- bash: rustup default nightly
- bash: rustup default nightly-2020-06-10
displayName: 'Install Rust'
- bash: |
set -e
Expand Down

0 comments on commit 98e4e2e

Please sign in to comment.