Skip to content

Commit

Permalink
Merge pull request #156 from nbigaouette/update-dependencies
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
nbigaouette authored Mar 27, 2021
2 parents c9574f3 + c0b863e commit 712c5f2
Show file tree
Hide file tree
Showing 16 changed files with 505 additions and 365 deletions.
30 changes: 15 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
matrix:
rust:
- 1.47.0
- 1.51.0
steps:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
Expand All @@ -42,7 +42,7 @@ jobs:
strategy:
matrix:
rust:
- 1.47.0
- 1.51.0
steps:
- uses: actions/checkout@v1
with:
Expand Down Expand Up @@ -86,23 +86,23 @@ jobs:
include:
- build: linux-musl
os: ubuntu-18.04
rust: 1.47.0
rust: 1.51.0
target: x86_64-unknown-linux-musl
- build: linux-gnu
os: ubuntu-18.04
rust: 1.47.0
rust: 1.51.0
target: x86_64-unknown-linux-gnu
- build: macos
os: macOS-latest
rust: 1.47.0
rust: 1.51.0
target: x86_64-apple-darwin
- build: win-gnu
os: windows-2019
rust: 1.47.0
rust: 1.51.0
target: x86_64-pc-windows-gnu
- build: win-msvc
os: windows-2019
rust: 1.47.0
rust: 1.51.0
target: x86_64-pc-windows-msvc
env:
CARGO_BUILD_TARGET: ${{ matrix.target }}
Expand All @@ -129,7 +129,7 @@ jobs:
# https://www.reddit.com/r/rust/comments/cvyuqk/uptodate_way_to_crosscompile_from_osx_to_windows/
run: |
$crt2="C:\ProgramData\Chocolatey\lib\mingw\tools\install\mingw64\x86_64-w64-mingw32\lib\crt2.o"
Copy-Item $crt2 -Destination C:\Rust\.rustup\toolchains\1.47.0-x86_64-pc-windows-msvc\lib\rustlib\x86_64-pc-windows-gnu\lib\crt2.o -Force
Copy-Item $crt2 -Destination C:\Rust\.rustup\toolchains\1.51.0-x86_64-pc-windows-msvc\lib\rustlib\x86_64-pc-windows-gnu\lib\crt2.o -Force
# - name: Cache (cargo registry)
# uses: actions/cache@v1
# with:
Expand Down Expand Up @@ -196,7 +196,7 @@ jobs:
strategy:
matrix:
rust:
- 1.47.0
- 1.51.0
steps:
- uses: actions/checkout@v1
with:
Expand Down Expand Up @@ -233,7 +233,7 @@ jobs:
strategy:
matrix:
rust:
- 1.47.0
- 1.51.0

steps:
- name: Checkout
Expand Down Expand Up @@ -352,19 +352,19 @@ jobs:
include:
- build: musl
os: ubuntu-18.04
rust: 1.47.0
rust: 1.51.0
target: x86_64-unknown-linux-musl
- build: macos
os: macOS-latest
rust: 1.47.0
rust: 1.51.0
target: x86_64-apple-darwin
- build: win-gnu
os: windows-2019
rust: 1.47.0
rust: 1.51.0
target: x86_64-pc-windows-gnu
- build: win-msvc
os: windows-2019
rust: 1.47.0
rust: 1.51.0
target: x86_64-pc-windows-msvc
env:
CARGO_BUILD_TARGET: ${{ matrix.target }}
Expand Down Expand Up @@ -396,7 +396,7 @@ jobs:
# https://www.reddit.com/r/rust/comments/cvyuqk/uptodate_way_to_crosscompile_from_osx_to_windows/
run: |
$crt2="C:\ProgramData\Chocolatey\lib\mingw\tools\install\mingw64\x86_64-w64-mingw32\lib\crt2.o"
Copy-Item $crt2 -Destination C:\Rust\.rustup\toolchains\1.47.0-x86_64-pc-windows-msvc\lib\rustlib\x86_64-pc-windows-gnu\lib\crt2.o -Force
Copy-Item $crt2 -Destination C:\Rust\.rustup\toolchains\1.51.0-x86_64-pc-windows-msvc\lib\rustlib\x86_64-pc-windows-gnu\lib\crt2.o -Force
- name: Build release
uses: actions-rs/cargo@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
rust:
- 1.47.0
- 1.51.0

steps:
- name: Checkout
Expand Down
Loading

0 comments on commit 712c5f2

Please sign in to comment.