Skip to content

Commit

Permalink
Merge branch 'main' into metrics_count_warn_info
Browse files Browse the repository at this point in the history
  • Loading branch information
brianolson authored Jun 18, 2024
2 parents bf55b2c + 032b8f9 commit e8d3ae1
Show file tree
Hide file tree
Showing 575 changed files with 22,096 additions and 5,527 deletions.
2 changes: 1 addition & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ x = "run --package aptos-cargo-cli --bin aptos-cargo-cli --"
[build]
rustflags = ["--cfg", "tokio_unstable", "-C", "force-frame-pointers=yes", "-C", "force-unwind-tables=yes"]

# TODO(grao): Figure out whether we should enable other cpu features, and whether we should use a different way to configure them rather than list every single one here.
# TODO(grao): Figure out whether we should enable othaer cpu features, and whether we should use a different way to configure them rather than list every single one here.
[target.x86_64-unknown-linux-gnu]
rustflags = ["--cfg", "tokio_unstable", "-C", "link-arg=-fuse-ld=lld", "-C", "force-frame-pointers=yes", "-C", "force-unwind-tables=yes", "-C", "target-feature=+sse4.2"]

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/rust-unit-tests/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ runs:
# Run the rust unit tests
- name: Run all unit tests
run: |
NEXTEST_EXPERIMENTAL_LIBTEST_JSON=1 cargo nextest run --profile ci --cargo-profile ci --locked --workspace --exclude smoke-test --exclude aptos-testcases --retries 3 --no-fail-fast --message-format libtest-json > nextest_output.json || python3 .github/actions/rust-unit-tests/nextest_summary.py nextest_output.json "$GITHUB_STEP_SUMMARY" -f
NEXTEST_EXPERIMENTAL_LIBTEST_JSON=1 cargo nextest run --profile ci --cargo-profile ci --locked --workspace --exclude smoke-test --exclude aptos-testcases --exclude aptos-keyless-circuit --retries 3 --no-fail-fast --message-format libtest-json > nextest_output.json || python3 .github/actions/rust-unit-tests/nextest_summary.py nextest_output.json "$GITHUB_STEP_SUMMARY" -f
buildkite-test-collector < nextest_output.json || echo "Warning: buildkite-test-collector encountered an error"
python3 .github/actions/rust-unit-tests/nextest_summary.py nextest_output.json "$GITHUB_STEP_SUMMARY" || echo "summary generation had an error"
rm nextest_output.json
Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/fuzzer-test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: "Fuzzers test"

on:
pull_request:
types: [labeled, opened, synchronize, reopened, auto_merge_enabled]
push:
branches:
- main
workflow_dispatch:

jobs:
test-fuzzers:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Install Dependencies
shell: bash
run: |
scripts/dev_setup.sh -b
- name: Test Fuzzers
shell: bash
run: |
cd testsuite/fuzzer && ./fuzz.sh test
32 changes: 32 additions & 0 deletions .github/workflows/keyless-circuit-daily-test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: "Keyless Circuit Daily Test"
on:
# Allow us to manually run this specific workflow without a PR
workflow_dispatch:
schedule:
- cron: "12 12 * * *" # at 12:12 UTC every day
pull_request:
paths:
- ".github/workflows/keyless-circuit-daily-test.yaml"
- "keyless/circuit/**"
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-all-circuit-tests:
runs-on: high-perf-docker
timeout-minutes: 30
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # get all the history because cargo xtest --change-since origin/main requires it.
- uses: ./.github/actions/rust-setup
- run: |
. keyless/circuit/tools/install-deps.sh
cargo test -p aptos-keyless-circuit -- --nocapture
6 changes: 1 addition & 5 deletions .github/workflows/replay-verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,7 @@ on:
- ".github/workflows/replay-verify.yaml"
- "testsuite/replay_verify.py"
schedule:
- cron: "0 22 * * *"
push:
branches:
- aptos-release-v* # the aptos release branches
- aptos-node-v*
- cron: "0 22 * * 0,2,4"

# cancel redundant builds
concurrency:
Expand Down
22 changes: 13 additions & 9 deletions .github/workflows/windows-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,20 @@ on:
workflow_dispatch:
pull_request:
types: [labeled, opened, synchronize, reopened, auto_merge_enabled]
push:
branches:
- main
schedule:
# Run twice a day at 12PM PT and 8PM PT Monday through Friday
- cron: "0 19,3 * * 1-5"
# Run once a day at 12PM PT on Saturday and Sunday
- cron: "0 19 * * 6,0"

jobs:
windows-build:
runs-on: windows-latest-8-core
runs-on: windows-latest
if: | # Only run on each PR once an appropriate event occurs
(
github.event_name == 'workflow_dispatch' ||
github.event_name == 'push' ||
contains(github.event.pull_request.labels.*.name, 'CICD:run-windows-tests') ||
github.event.pull_request.auto_merge != null
github.event_name == 'schedule' ||
contains(github.event.pull_request.labels.*.name, 'CICD:run-windows-tests')
)
defaults:
run:
Expand All @@ -34,8 +35,11 @@ jobs:
- name: Run cargo cache
uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # [email protected]

- name: Install the developer tools
run: PowerShell -ExecutionPolicy Bypass -File scripts/windows_dev_setup.ps1
- name: Set up WinGet
run: Set-Variable ProgressPreference SilentlyContinue ; PowerShell -ExecutionPolicy Bypass -File scripts/windows_dev_setup.ps1

- name: Install the Developer Tools
run: Set-Variable ProgressPreference SilentlyContinue ; PowerShell -ExecutionPolicy Bypass -File scripts/windows_dev_setup.ps1 -t

# This is required for the openssl-sys crate to build.
# See: https://github.com/sfackler/rust-openssl/issues/1542#issuecomment-1399358351
Expand Down
Loading

0 comments on commit e8d3ae1

Please sign in to comment.