mirror of
https://github.com/ProvableHQ/leo.git
synced 2024-11-30 23:33:27 +03:00
merge master
This commit is contained in:
commit
f60e4331c7
@ -1,2 +1,2 @@
|
|||||||
[target.'cfg(not(target_arch = "wasm32"))']
|
[target.'cfg(any(not(target_arch = "wasm32"), feature = "noconfig"))']
|
||||||
rustflags = ["-C", "target-cpu=native"]
|
rustflags = ["-C", "target-cpu=native"]
|
||||||
|
@ -44,7 +44,7 @@ jobs:
|
|||||||
|
|
||||||
rust-stable:
|
rust-stable:
|
||||||
docker:
|
docker:
|
||||||
- image: cimg/rust:1.50.0
|
- image: cimg/rust:1.51.0
|
||||||
resource_class: xlarge
|
resource_class: xlarge
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
@ -62,7 +62,7 @@ jobs:
|
|||||||
|
|
||||||
rust-nightly:
|
rust-nightly:
|
||||||
docker:
|
docker:
|
||||||
- image: howardwu/snarkos-ci:2021-01-31
|
- image: howardwu/snarkos-ci:2021-03-25
|
||||||
resource_class: xlarge
|
resource_class: xlarge
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
@ -77,7 +77,7 @@ jobs:
|
|||||||
|
|
||||||
leo-executable:
|
leo-executable:
|
||||||
docker:
|
docker:
|
||||||
- image: cimg/rust:1.50.0
|
- image: cimg/rust:1.51.0
|
||||||
resource_class: xlarge
|
resource_class: xlarge
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
@ -86,7 +86,7 @@ jobs:
|
|||||||
- run:
|
- run:
|
||||||
name: Build and install Leo
|
name: Build and install Leo
|
||||||
no_output_timeout: 30m
|
no_output_timeout: 30m
|
||||||
command: cargo install --path . --root .
|
command: cargo install --path . --root . --locked
|
||||||
- persist_to_workspace:
|
- persist_to_workspace:
|
||||||
root: ~/
|
root: ~/
|
||||||
paths: project/
|
paths: project/
|
||||||
@ -95,7 +95,7 @@ jobs:
|
|||||||
|
|
||||||
leo-new:
|
leo-new:
|
||||||
docker:
|
docker:
|
||||||
- image: cimg/rust:1.50.0
|
- image: cimg/rust:1.51.0
|
||||||
resource_class: xlarge
|
resource_class: xlarge
|
||||||
steps:
|
steps:
|
||||||
- attach_workspace:
|
- attach_workspace:
|
||||||
@ -108,7 +108,7 @@ jobs:
|
|||||||
|
|
||||||
leo-init:
|
leo-init:
|
||||||
docker:
|
docker:
|
||||||
- image: cimg/rust:1.50.0
|
- image: cimg/rust:1.51.0
|
||||||
resource_class: xlarge
|
resource_class: xlarge
|
||||||
steps:
|
steps:
|
||||||
- attach_workspace:
|
- attach_workspace:
|
||||||
@ -121,7 +121,7 @@ jobs:
|
|||||||
|
|
||||||
leo-clean:
|
leo-clean:
|
||||||
docker:
|
docker:
|
||||||
- image: cimg/rust:1.50.0
|
- image: cimg/rust:1.51.0
|
||||||
resource_class: xlarge
|
resource_class: xlarge
|
||||||
steps:
|
steps:
|
||||||
- attach_workspace:
|
- attach_workspace:
|
||||||
@ -134,7 +134,7 @@ jobs:
|
|||||||
|
|
||||||
leo-setup:
|
leo-setup:
|
||||||
docker:
|
docker:
|
||||||
- image: cimg/rust:1.50.0
|
- image: cimg/rust:1.51.0
|
||||||
resource_class: xlarge
|
resource_class: xlarge
|
||||||
steps:
|
steps:
|
||||||
- attach_workspace:
|
- attach_workspace:
|
||||||
@ -147,7 +147,7 @@ jobs:
|
|||||||
|
|
||||||
leo-add-remove:
|
leo-add-remove:
|
||||||
docker:
|
docker:
|
||||||
- image: cimg/rust:1.50.0
|
- image: cimg/rust:1.51.0
|
||||||
resource_class: xlarge
|
resource_class: xlarge
|
||||||
steps:
|
steps:
|
||||||
- attach_workspace:
|
- attach_workspace:
|
||||||
@ -160,7 +160,7 @@ jobs:
|
|||||||
|
|
||||||
leo-login-logout:
|
leo-login-logout:
|
||||||
docker:
|
docker:
|
||||||
- image: cimg/rust:1.50.0
|
- image: cimg/rust:1.51.0
|
||||||
resource_class: xlarge
|
resource_class: xlarge
|
||||||
steps:
|
steps:
|
||||||
- attach_workspace:
|
- attach_workspace:
|
||||||
@ -173,7 +173,7 @@ jobs:
|
|||||||
|
|
||||||
leo-clone:
|
leo-clone:
|
||||||
docker:
|
docker:
|
||||||
- image: cimg/rust:1.50.0
|
- image: cimg/rust:1.51.0
|
||||||
resource_class: xlarge
|
resource_class: xlarge
|
||||||
steps:
|
steps:
|
||||||
- attach_workspace:
|
- attach_workspace:
|
||||||
@ -186,7 +186,7 @@ jobs:
|
|||||||
|
|
||||||
leo-publish:
|
leo-publish:
|
||||||
docker:
|
docker:
|
||||||
- image: cimg/rust:1.50.0
|
- image: cimg/rust:1.51.0
|
||||||
resource_class: xlarge
|
resource_class: xlarge
|
||||||
steps:
|
steps:
|
||||||
- attach_workspace:
|
- attach_workspace:
|
||||||
|
23
.github/workflows/release.yml
vendored
23
.github/workflows/release.yml
vendored
@ -25,7 +25,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Build Leo
|
- name: Build Leo
|
||||||
run: |
|
run: |
|
||||||
cargo build --all --release && strip target/release/leo
|
cargo build --all --release --features noconfig && strip target/release/leo
|
||||||
env:
|
env:
|
||||||
CARGO_NET_GIT_FETCH_WITH_CLI: true
|
CARGO_NET_GIT_FETCH_WITH_CLI: true
|
||||||
|
|
||||||
@ -67,7 +67,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Build Leo
|
- name: Build Leo
|
||||||
run: |
|
run: |
|
||||||
cargo build --all --release && strip target/release/leo
|
cargo build --all --release --features noconfig && strip target/release/leo
|
||||||
env:
|
env:
|
||||||
CARGO_NET_GIT_FETCH_WITH_CLI: true
|
CARGO_NET_GIT_FETCH_WITH_CLI: true
|
||||||
|
|
||||||
@ -95,7 +95,6 @@ jobs:
|
|||||||
windows:
|
windows:
|
||||||
name: Windows
|
name: Windows
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
continue-on-error: true
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v1
|
uses: actions/checkout@v1
|
||||||
@ -111,12 +110,15 @@ jobs:
|
|||||||
- name: Install LLVM and Clang
|
- name: Install LLVM and Clang
|
||||||
uses: KyleMayes/install-llvm-action@v1
|
uses: KyleMayes/install-llvm-action@v1
|
||||||
with:
|
with:
|
||||||
version: "10.0"
|
version: "11"
|
||||||
directory: ~ / .clang
|
directory: ${{ runner.temp }}/llvm
|
||||||
|
|
||||||
|
- name: Set LIBCLANG_PATH
|
||||||
|
run: echo "LIBCLANG_PATH=$((gcm clang).source -replace "clang.exe")" >> $env:GITHUB_ENV
|
||||||
|
|
||||||
- name: Build Leo
|
- name: Build Leo
|
||||||
run: |
|
run: |
|
||||||
cargo build --all --release
|
cargo build --all --release --features noconfig
|
||||||
env:
|
env:
|
||||||
CARGO_NET_GIT_FETCH_WITH_CLI: true
|
CARGO_NET_GIT_FETCH_WITH_CLI: true
|
||||||
|
|
||||||
@ -125,18 +127,13 @@ jobs:
|
|||||||
|
|
||||||
- name: Zip
|
- name: Zip
|
||||||
run: |
|
run: |
|
||||||
mkdir tempdir
|
Compress-Archive target/release/leo.exe leo-${{ steps.get_version.outputs.version }}-x86_64-pc-windows-msvc.zip
|
||||||
mv target/release/leo tempdir
|
|
||||||
cd tempdir
|
|
||||||
Compress-Archive leo-${{ steps.get_version.outputs.version }}-x86_64-pc-windows-gnu leo
|
|
||||||
cd ..
|
|
||||||
mv leo-${{ steps.get_version.outputs.version }}-x86_64-pc-windows-gnu .
|
|
||||||
|
|
||||||
- name: Release
|
- name: Release
|
||||||
uses: softprops/action-gh-release@v1
|
uses: softprops/action-gh-release@v1
|
||||||
if: startsWith(github.ref, 'refs/tags/')
|
if: startsWith(github.ref, 'refs/tags/')
|
||||||
with:
|
with:
|
||||||
files: |
|
files: |
|
||||||
leo-${{ steps.get_version.outputs.version }}-x86_64-pc-windows-gnu.zip
|
leo-${{ steps.get_version.outputs.version }}-x86_64-pc-windows-msvc.zip
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
@ -155,8 +155,10 @@ version = "0.5"
|
|||||||
version = "0.11.2"
|
version = "0.11.2"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = [ ]
|
default = []
|
||||||
ci_skip = [ "leo-compiler/ci_skip" ]
|
ci_skip = [ "leo-compiler/ci_skip" ]
|
||||||
|
# This feature flag is used to disable `target-cpu=native` in `.cargo/config`.
|
||||||
|
noconfig = []
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
opt-level = 3
|
opt-level = 3
|
||||||
|
Loading…
Reference in New Issue
Block a user