Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnChangUK committed Feb 1, 2024
2 parents e796ad5 + b04e03c commit 5b8441a
Show file tree
Hide file tree
Showing 167 changed files with 12,849 additions and 566 deletions.
37 changes: 37 additions & 0 deletions .github/actions/move-tests-compiler-v2/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Aptos Move Test for Compiler V2
description: Runs Aptos Move tests with compiler V2
inputs:
GIT_CREDENTIALS:
description: "Optional credentials to pass to git. Useful if you need to pull private repos for dependencies"
required: false

runs:
using: composite
steps:
# Checkout the repository and setup the rust toolchain
- uses: actions/checkout@v3
with:
fetch-depth: 0 # get all the history because cargo xtest --change-since origin/main requires it.
- uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
with:
GIT_CREDENTIALS: ${{ inputs.GIT_CREDENTIALS }}

# Install nextest
- uses: taiki-e/install-action@v1.5.6
with:
tool: nextest

# Run Aptos Move tests with compiler V2
- name: Run Aptos Move tests with compiler V2
run: cargo nextest run --profile ci --locked -p e2e-move-tests -p aptos-framework --retries 3 --no-fail-fast
shell: bash
env:
MOVE_COMPILER_EXP: no-safety
MOVE_COMPILER_V2: true
RUST_MIN_STACK: 4297152
MVP_TEST_ON_CI: true
SOLC_EXE: /home/runner/bin/solc
Z3_EXE: /home/runner/bin/z3
CVC5_EXE: /home/runner/bin/cvc5
DOTNET_ROOT: /home/runner/.dotnet
BOOGIE_EXE: /home/runner/.dotnet/tools/boogie
17 changes: 16 additions & 1 deletion .github/workflows/coverage-move-only.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@ on:
paths:
- 'third_party/move/**'
- 'aptos-move/e2e-move-tests/**'
- 'aptos-move/framework/**'
- '.github/workflows/coverage-move-only.yaml'
pull_request:
paths:
- 'third_party/move/**'
- 'aptos-move/e2e-move-tests/**'
- 'aptos-move/framework/**'
- '.github/workflows/coverage-move-only.yaml'

env:
CARGO_INCREMENTAL: "0"
Expand All @@ -30,12 +34,23 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
- name: prepare move lang prover tooling.
shell: bash
run: |
echo 'Z3_EXE='/home/runner/bin/z3 | tee -a $GITHUB_ENV
echo 'CVC5_EXE='/home/runner/bin/cvc5 | tee -a $GITHUB_ENV
echo 'DOTNET_ROOT='/home/runner/.dotnet/ | tee -a $GITHUB_ENV
echo 'BOOGIE_EXE='/home/runner/.dotnet/tools/boogie | tee -a $GITHUB_ENV
echo 'MVP_TEST_ON_CI'='1' | tee -a $GITHUB_ENV
echo "/home/runner/bin" | tee -a $GITHUB_PATH
echo "/home/runner/.dotnet" | tee -a $GITHUB_PATH
echo "/home/runner/.dotnet/tools" | tee -a $GITHUB_PATH
- run: rustup component add llvm-tools-preview
- uses: taiki-e/install-action@6f1ebcd9e21315fc37d7f7bc851dfcc8356d7da3 # pin@v1.5.6
with:
tool: nextest,cargo-llvm-cov
- run: docker run --detach -p 5432:5432 cimg/postgres:14.2
- run: cargo llvm-cov --ignore-run-fail -p "move*" -p e2e-move-tests --lcov --jobs 32 --output-path lcov_unit.info
- run: cargo llvm-cov --ignore-run-fail -p aptos-framework -p "move*" -p e2e-move-tests --lcov --jobs 32 --output-path lcov_unit.info
env:
INDEXER_DATABASE_URL: postgresql://postgres@localhost/postgres
- uses: actions/upload-artifact@v3
Expand Down
40 changes: 40 additions & 0 deletions .github/workflows/move-test-compiler-v2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: "Aptos Move Test for Compiler V2"
on:
workflow_dispatch:
push:
branches:
- 'main'
paths:
- 'aptos-move/e2e-move-tests/**'
- 'aptos-move/framework/**'
- 'third_party/move/**'
- '.github/workflows/move-test-compiler-v2.yaml'
- '.github/actions/move-tests-compiler-v2/**'
pull_request:
paths:
- 'aptos-move/e2e-move-tests/**'
- 'aptos-move/framework/**'
- 'third_party/move/**'
- '.github/workflows/move-test-compiler-v2.yaml'
- '.github/actions/move-tests-compiler-v2/**'

env:
CARGO_INCREMENTAL: "0"
CARGO_TERM_COLOR: always

# cancel redundant builds
concurrency:
# cancel redundant builds on PRs (only on PR, not on branches)
group: ${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.ref) || github.sha }}
cancel-in-progress: true

jobs:
# Run Aptos Move tests.
rust-move-tests:
runs-on: high-perf-docker
steps:
- uses: actions/checkout@v3
- name: Run Aptos Move tests with compiler V2
uses: ./.github/actions/move-tests-compiler-v2
with:
GIT_CREDENTIALS: ${{ secrets.GIT_CREDENTIALS }}
3 changes: 3 additions & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,7 @@
# Owners for the `/terraform` directory and all its subdirectories.
/terraform/ @aptos-labs/prod-eng

# Owners for the `aptos-dkg` crate.
/crates/aptos-dkg @alinush

/types/src/transaction/authenticator.rs @alinush
127 changes: 120 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5b8441a

Please sign in to comment.