Skip to content

Commit

Permalink
The matches! macro requires rust 1.42
Browse files Browse the repository at this point in the history
This was caught by docker hub builder. So, add test for this in CI.

Update images as well.

Signed-off-by: Sean Young <[email protected]>
  • Loading branch information
seanyoung committed Aug 1, 2020
1 parent d104f52 commit 916b86c
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ name: Build Release Binaries
jobs:
linux:
name: Build Linux
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- name: Checkout sources
uses: actions/checkout@v2
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on: [push, pull_request]
jobs:
lints:
name: Lints
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- name: Checkout sources
uses: actions/checkout@v2
Expand All @@ -29,7 +29,7 @@ jobs:

test:
name: Test
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- name: Checkout sources
uses: actions/checkout@v2
Expand All @@ -48,3 +48,12 @@ jobs:
run: cargo build --verbose
- name: Run tests
run: cargo test --verbose

dockerfile:
name: docker
runs-on: ubuntu-20.04
steps:
- name: Checkout sources
uses: actions/checkout@v2
- name: Build dockerfile
run: docker build .
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Ubuntu 18.04 produces a builder image 1.53 GiB and solang image of 84 MiB
# Debian Buster produces a builder image 2.04 GiB

FROM rust:1.40-slim-buster as builder
FROM rust:1.42-slim-buster as builder
MAINTAINER Sean Young <[email protected]>
RUN echo 'deb http://deb.debian.org/debian buster-backports main' >> /etc/apt/sources.list
RUN apt-get update
Expand Down
4 changes: 2 additions & 2 deletions docs/installing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ this has not been updated in a long time. This is due to

Building Solang from source
---------------------------
In order to build solang from source, you will need rust 1.40.0 or higher,
In order to build solang from source, you will need rust 1.42.0 or higher,
and llvm version 8 or higher with the WebAssembly target enabled.

So see if you have the correct version of rust, simply execute:
Expand Down Expand Up @@ -200,4 +200,4 @@ is in Solang github repo. Simply run the dockerfile:
docker build -f build-llvm-windows.dockerfile .
This will take a few hours. The result will be dockerfile with llvm compressed in ``llvm80.zip`` in the image.
This will take a few hours. The result will be an image with llvm compressed in ``c:\llvm80.zip``.

0 comments on commit 916b86c

Please sign in to comment.