Skip to content

Commit 8b9cdb7

Browse files
Merge branch 'main' into fix/soroban-auth-signing-with-ledger
2 parents e9b0685 + 24bfc54 commit 8b9cdb7

File tree

175 files changed

+6063
-2808
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+6063
-2808
lines changed

.cargo/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[alias] # command aliases
44
f = "fmt"
5-
md-gen = "run --bin doc-gen"
5+
md-gen = "run --package doc-gen"
66
s = "run --quiet --"
77
# b = "build"
88
# c = "check"

.github/actions/build-and-test/action.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ runs:
3030
- if: runner.os == 'Linux'
3131
run: sudo apt-get update && sudo apt-get -y install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libudev-dev libdbus-1-dev
3232
shell: bash
33+
- run: make build-test-wasms
34+
shell: bash
35+
env:
36+
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
37+
CARGO_BUILD_TARGET: ${{ inputs.target }}
38+
CI_TESTS: true
3339
- run: cargo clippy --all-targets --target ${{ inputs.target }}
3440
shell: bash
3541
- run: make test

.github/copilot-instructions.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ stellar keys address test # Test key operations
113113
The project uses GitHub Actions with workflows in `.github/workflows/`:
114114

115115
- `rust.yml`: Main CI pipeline with formatting, linting, building, and testing
116-
- `e2e.yml`: End-to-end system tests
117116
- `binaries.yml`: Multi-platform binary builds
118117

119118
Always run `make fmt` and `make check` locally before pushing to ensure CI passes.

.github/workflows/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
action:
1515
strategy:
1616
matrix:
17-
image: [macos-13, ubuntu-latest, windows-latest]
17+
image: [macos-15, macos-15-intel, ubuntu-latest, windows-latest]
1818
runs-on: ${{ matrix.image }}
1919

2020
steps:

.github/workflows/binaries.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ jobs:
5353
- name: stellar-cli
5454
binary: stellar
5555
sys:
56-
- os: macos-14
56+
- os: macos-15
5757
target: aarch64-apple-darwin
58-
- os: macos-13
58+
- os: macos-15-intel
5959
target: x86_64-apple-darwin
6060
runs-on: ${{ matrix.sys.os }}
6161
steps:
@@ -112,7 +112,7 @@ jobs:
112112
- name: Uncompress Artifact
113113
run: tar xvf ${{ env.ARTIFACT_NAME }}
114114
- shell: powershell
115-
run: winget install --id JRSoftware.InnoSetup --scope machine --silent --accept-package-agreements --accept-source-agreements
115+
run: winget install --id JRSoftware.InnoSetup --scope machine --silent --accept-package-agreements --accept-source-agreements --force
116116
- shell: powershell
117117
run: |
118118
$innoPath = "C:\Program Files (x86)\Inno Setup 6"

.github/workflows/bindings-ts.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@ jobs:
1616
- ubuntu-latest-8-cores
1717
# ARM
1818
- ubuntu-jammy-8-cores-arm64
19-
# Intel
20-
- macos-13
19+
# Apple Intel (this runner has better support to nested virtualization)
20+
- macos-15-large
2121
exclude:
22-
# Only run Linux x64 tests on pull request to save some time
23-
- sys:
24-
${{ github.event_name != 'push' && 'ubuntu-jammy-8-cores-arm64' }}
25-
- sys: ${{ github.event_name != 'push' && 'macos-13' }}
22+
# Only run Linux x64 on non-release PRs to save CI minutes
23+
- sys: ${{ github.event_name != 'push' && !startsWith(github.ref_name, 'release/') && 'ubuntu-jammy-8-cores-arm64' }}
24+
- sys: ${{ github.event_name != 'push' && !startsWith(github.ref_name, 'release/') && 'macos-15-large' }}
2625
runs-on: ${{ matrix.sys }}
2726
steps:
2827
- uses: stellar/quickstart@main

.github/workflows/dependency-check.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/docs.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,18 @@ on:
77

88
concurrency:
99
group:
10-
${{ github.workflow }}-${{ github.ref_protected == 'true' && github.sha || github.ref }}
10+
${{ github.workflow }}-${{ github.ref_protected == 'true' && github.sha ||
11+
github.ref }}
1112
cancel-in-progress: true
1213

1314
jobs:
15+
github_context:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- run: |
19+
echo "github.sha => ${{ github.sha }}"
20+
echo "github.ref => ${{ github.ref }}"
21+
1422
docs-validation:
1523
uses: stellar/stellar-docs/.github/workflows/build.yml@main
1624
with:

.github/workflows/e2e.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

.github/workflows/ledger-emulator.yml

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,52 @@ jobs:
2323
- ubuntu-latest-8-cores
2424
# ARM
2525
- ubuntu-jammy-8-cores-arm64
26-
# Intel
27-
- macos-13
26+
# Apple Large Intel (this runner has better support to nested virtualization)
27+
# - macos-15-large (temporarily until the runner becomes more reliable. To be re-enabled in https://github.com/stellar/stellar-cli/issues/2299)
2828
exclude:
29-
# Only run Linux x64 tests on pull request to save some time
30-
- sys: ${{ github.event_name != 'push' && 'ubuntu-jammy-8-cores-arm64' }}
31-
- sys: ${{ github.event_name != 'push' && 'macos-13' }}
29+
# Only run Linux x64 on non-release PRs to save CI minutes
30+
- sys: ${{ github.event_name != 'push' && !startsWith(github.ref_name, 'release/') && 'ubuntu-jammy-8-cores-arm64' }}
31+
- sys: ${{ github.event_name != 'push' && !startsWith(github.ref_name, 'release/') && 'macos-15-large' }}
3232
runs-on: ${{ matrix.sys }}
3333
env:
3434
CI_TESTS: true
35+
TEST_THREADS: ${{ contains(matrix.sys, 'macos') && '--test-threads=1' || '' }} # macOS has limited resources, so we run tests (that rely on `testcontainers`) with 1 thread
3536
steps:
3637
- uses: actions/checkout@v5
38+
3739
- uses: stellar/actions/rust-cache@main
38-
- name: Setup Colima and Docker (macOS only)
40+
41+
- name: Install Colima & Docker
3942
if: runner.os == 'macos'
43+
env:
44+
GH_TOKEN: ${{ github.token }}
45+
shell: bash
4046
run: |
41-
brew install docker
42-
brew install colima
43-
colima start
44-
- name: Set DOCKER_HOST to Colima socket
47+
echo "::group::Installing Colima & Docker"
48+
brew install colima docker
49+
echo "::endgroup::"
50+
51+
- name: Start Colima
4552
if: runner.os == 'macos'
46-
run: echo "DOCKER_HOST=unix:///Users/runner/.colima/default/docker.sock" >> $GITHUB_ENV
53+
shell: bash
54+
run: |
55+
echo "::group::Starting Colima"
56+
CPU_COUNT=$(sysctl -n hw.ncpu)
57+
TOTAL_MEMORY=$(sysctl hw.memsize | awk '{print $2/1024/1024/1024}')
58+
MEMORY=$(awk "BEGIN {printf \"%.0f\", $TOTAL_MEMORY * 0.75}")
59+
echo "CPU_COUNT: $CPU_COUNT"
60+
echo "TOTAL_MEMORY: $TOTAL_MEMORY"
61+
colima start --arch x86_64 --vm-type=vz --mount-type=9p --cpu $CPU_COUNT --memory $TOTAL_MEMORY
62+
export DOCKER_HOST=unix:///Users/runner/.colima/default/docker.sock
63+
echo "DOCKER_HOST=unix:///Users/runner/.colima/default/docker.sock" >> $GITHUB_ENV
64+
echo "::endgroup::"
65+
4766
- name: install optional dependencies (Linux only)
4867
run: sudo apt update && sudo apt install -y libudev-dev libdbus-1-dev
4968
if: runner.os == 'Linux'
50-
- run: RUST_BACKTRACE=1 cargo test --manifest-path cmd/crates/stellar-ledger/Cargo.toml --features "emulator-tests" -- --nocapture
69+
70+
- run: RUST_BACKTRACE=1 cargo test --manifest-path cmd/crates/stellar-ledger/Cargo.toml --features "emulator-tests" -- --nocapture $TEST_THREADS
71+
5172
- run: RUST_BACKTRACE=1 cargo build --features emulator-tests,additional-libs
52-
- run: RUST_BACKTRACE=1 cargo test --features emulator-tests --package soroban-test --test it -- emulator
73+
74+
- run: RUST_BACKTRACE=1 cargo test --features emulator-tests --package soroban-test --test it -- emulator $TEST_THREADS

0 commit comments

Comments
 (0)