Skip to content

Commit

Permalink
Update Rust to 1.51.0 (from 1.47.0)
Browse files Browse the repository at this point in the history
  • Loading branch information
nbigaouette committed Mar 27, 2021
1 parent ee8e276 commit d8032ad
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 25 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
10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# Build the image:
# export OS_NAME="ubuntu"
# export OS_VERSION="16.04"
# export RUST_VERSION="1.47.0"
# export RUST_VERSION="1.51.0"
# docker build --build-arg OS_NAME=${OS_NAME} --build-arg OS_VERSION=${OS_VERSION} --build-arg DOCKER_GID=`id --group` --build-arg DOCKER_UID=`id --user` --build-arg RUST_VERSION=${RUST_VERSION} --tag hygeia_${OS_NAME} --file docker/${OS_NAME}/Dockerfile .
# docker run --rm --detach --name hygeia_${OS_NAME} --volume `pwd`/docker/${OS_NAME}/artifacts:/home/hygeia/artifacts hygeia_${OS_NAME} sleep 9999999
# docker exec -it hygeia_${OS_NAME} hygeia install ~3.7 --extra
Expand All @@ -46,7 +46,7 @@ services:
args:
OS_NAME: "ubuntu"
OS_VERSION: "16.04"
RUST_VERSION: "1.47.0"
RUST_VERSION: "1.51.0"
environment:
RUST_LOG: hygeia=debug
stdin_open: true
Expand All @@ -62,7 +62,7 @@ services:
args:
OS_NAME: "debian"
OS_VERSION: "sid-20191224"
RUST_VERSION: "1.47.0"
RUST_VERSION: "1.51.0"
environment:
RUST_LOG: hygeia=debug
stdin_open: true
Expand All @@ -78,7 +78,7 @@ services:
args:
OS_NAME: "fedora"
OS_VERSION: "31"
RUST_VERSION: "1.47.0"
RUST_VERSION: "1.51.0"
environment:
RUST_LOG: hygeia=debug
stdin_open: true
Expand All @@ -94,7 +94,7 @@ services:
args:
OS_NAME: "alpine"
OS_VERSION: "3.10.3"
RUST_VERSION: "1.47.0"
RUST_VERSION: "1.51.0"
# See https://github.com/rust-lang/rust/issues/59302
RUSTFLAGS: -C target-feature=-crt-static
environment:
Expand Down
2 changes: 1 addition & 1 deletion docker/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LABEL hygeia_${OS_NAME}_${OS_VERSION}_builder=true

ARG DOCKER_GID=7926
ARG DOCKER_UID=7926
ARG RUST_VERSION=1.47.0
ARG RUST_VERSION=1.51.0
ARG RUSTFLAGS

ENV RUST_VERSION=${RUST_VERSION}
Expand Down
2 changes: 1 addition & 1 deletion docker/debian/sid/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LABEL hygeia_${OS_NAME}_${OS_VERSION}_builder=true

ARG DOCKER_GID=792677
ARG DOCKER_UID=792677
ARG RUST_VERSION=1.47.0
ARG RUST_VERSION=1.51.0


ENV RUST_VERSION=${RUST_VERSION}
Expand Down
2 changes: 1 addition & 1 deletion docker/fedora/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LABEL hygeia_${OS_NAME}_${OS_VERSION}_builder=true

ARG DOCKER_GID=792677
ARG DOCKER_UID=792677
ARG RUST_VERSION=1.47.0
ARG RUST_VERSION=1.51.0


ENV RUST_VERSION=${RUST_VERSION}
Expand Down
2 changes: 1 addition & 1 deletion docker/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LABEL hygeia_${OS_NAME}_${OS_VERSION}_builder=true

ARG DOCKER_GID=792677
ARG DOCKER_UID=792677
ARG RUST_VERSION=1.47.0
ARG RUST_VERSION=1.51.0


ENV RUST_VERSION=${RUST_VERSION}
Expand Down

0 comments on commit d8032ad

Please sign in to comment.