Эх сурвалжийг харах

Move to rust 1.56.1

We use a rust 1.56 feature in a following commit.

Signed-off-by: Sean Young <sean@mess.org>
Sean Young 4 жил өмнө
parent
commit
534e601bdc

+ 1 - 1
.github/Dockerfile

@@ -29,7 +29,7 @@ RUN apt-get clean
 RUN apt-get autoclean
 
 # Get Rust
-RUN curl https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain 1.53.0
+RUN curl https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain 1.56.1
 
 COPY --from=builder /llvm13.0 /llvm13.0/
 

+ 3 - 3
.github/workflows/release.yml

@@ -34,7 +34,7 @@ jobs:
     - name: Add LLVM to Path
       run: echo "$(pwd)/llvm13.0/bin" >> $GITHUB_PATH
     - name: Rust stable
-      run: rustup default 1.53.0
+      run: rustup default 1.56.1
     - name: Build
       run: cargo build --verbose --release
     - name: Run tests
@@ -176,8 +176,8 @@ jobs:
     steps:
     - name: Checkout sources
       uses: actions/checkout@v2
-    - run: |
-        docker build . -t ghcr.io/${GITHUB_REPOSITORY}:${GITHUB_REF/refs\/tags\//} \
+    - run:
+        docker build . -t ghcr.io/${GITHUB_REPOSITORY}:${GITHUB_REF/refs\/tags\//}
             --label org.opencontainers.image.description="Solidity Compiler for Solana, Substrate, and ewasm version $(git describe --tags)"
     - run: |
         echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin

+ 1 - 1
.github/workflows/test.yml

@@ -36,7 +36,7 @@ jobs:
       # checkout@v2 requires git 2.18 or higher, which is not in our image
       uses: actions/checkout@v1
     - name: Rust stable
-      run: rustup default 1.53.0
+      run: rustup default 1.56.1
     - name: Build
       run: cargo build --verbose
     - name: Run tests

+ 2 - 0
Dockerfile

@@ -12,6 +12,8 @@ COPY . src
 WORKDIR /src/stdlib/
 RUN make
 
+RUN rustup default 1.56.1
+
 WORKDIR /src
 RUN cargo build --release
 

+ 1 - 1
docs/installing.rst

@@ -53,7 +53,7 @@ Then you can build the image using:
 Building Solang from source
 ---------------------------
 
-In order to build Solang from source, you will need rust 1.53.0 or higher,
+In order to build Solang from source, you will need rust 1.56.1 or higher,
 and a build of llvm based on the Solana llvm tree. There are a few patches which are not upstream yet.
 First, follow the steps below for installing llvm and then proceed from there.