Przeglądaj źródła

build release binaries on ubuntu-18.04, not 20.04

This makes the binaries compatible with more distributions.

Signed-off-by: Sean Young <sean@mess.org>
Sean Young 5 lat temu
rodzic
commit
0473e2b0ad

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

@@ -8,7 +8,7 @@ name: Build Release Binaries
 jobs:
   linux:
     name: Linux
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-18.04
     container: hyperledgerlabs/solang:ci
     steps:
     - name: Checkout sources

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

@@ -3,7 +3,7 @@ on: [push, pull_request]
 jobs:
   lints:
     name: Lints
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-18.04
     container: hyperledgerlabs/solang:ci
     steps:
       - name: Checkout sources
@@ -17,7 +17,7 @@ jobs:
 
   linux:
     name: Linux
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-18.04
     container: hyperledgerlabs/solang:ci
     steps:
     - name: Checkout sources
@@ -54,7 +54,7 @@ jobs:
 
   docker:
     name: Docker
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-18.04
     steps:
     - name: Checkout sources
       uses: actions/checkout@v2

+ 1 - 1
Dockerfile

@@ -14,7 +14,7 @@ RUN clang-10 --target=wasm32 -c -emit-llvm -O3 -ffreestanding -fno-builtin -Wall
 
 RUN cargo install --path /src
 
-FROM ubuntu:20.04
+FROM ubuntu:18.04
 COPY --from=builder /root/.cargo/bin/solang /usr/bin/solang
 
 ENTRYPOINT ["/usr/bin/solang"]

+ 5 - 4
scripts/build-llvm-linux.dockerfile

@@ -1,10 +1,11 @@
-FROM ubuntu:20.04
+FROM ubuntu:18.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update
 RUN apt-get install -y libz-dev pkg-config libssl-dev git cmake ninja-build gcc g++ python
 
-RUN git clone git://github.com/llvm/llvm-project
+RUN git clone --branch release/10.x --single-branch \
+    git://github.com/llvm/llvm-project
 
 WORKDIR /llvm-project
 
@@ -12,8 +13,8 @@ RUN git checkout -b release_10.x origin/release/10.x
 
 RUN cmake -G Ninja -DLLVM_ENABLE_ASSERTIONS=On -DLLVM_ENABLE_PROJECTS=clang  \
     -DLLVM_ENABLE_TERMINFO=Off -DLLVM_TARGETS_TO_BUILD=WebAssembly \
-    -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/llvm10.0 -B build llvm
+    -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/llvm10.0 llvm
 
-RUN cmake --build build --target install
+RUN cmake --build . --target install
 
 RUN tar jcf /llvm10.0.tar.bz2 /llvm10.0/

+ 6 - 7
scripts/ci.dockerfile

@@ -1,22 +1,21 @@
-FROM ubuntu:20.04 as builder
+FROM ubuntu:18.04 as builder
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update
 RUN apt-get install -y libz-dev pkg-config libssl-dev git cmake ninja-build gcc g++ python
 
-RUN git clone git://github.com/llvm/llvm-project
+RUN git clone --branch release/10.x --single-branch \
+    git://github.com/llvm/llvm-project
 
 WORKDIR /llvm-project
 
-RUN git checkout -b release_10.x origin/release/10.x
-
 RUN cmake -G Ninja -DLLVM_ENABLE_ASSERTIONS=On -DLLVM_ENABLE_PROJECTS=clang  \
     -DLLVM_ENABLE_TERMINFO=Off -DLLVM_TARGETS_TO_BUILD=WebAssembly \
-    -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/llvm10.0 -B build llvm
+    -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/llvm10.0 llvm
 
-RUN cmake --build build --target install
+RUN cmake --build . --target install
 
-FROM ubuntu:20.04
+FROM ubuntu:18.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update