Skip to content

Commit b4d4b90

Browse files
committed
Merge branch 'dev' into stable
2 parents bd9a552 + 4f2d43b commit b4d4b90

File tree

127 files changed

+10588
-5956
lines changed

Some content is hidden

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

127 files changed

+10588
-5956
lines changed

.github/workflows/cargo-checkmate.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-22.04
99
if: github.event.pull_request.draft == false
1010
steps:
11-
- uses: taiki-e/cache-cargo-install-action@v1
11+
- uses: taiki-e/cache-cargo-install-action@v2
1212
with:
1313
tool: cargo-checkmate
1414

@@ -23,15 +23,18 @@ jobs:
2323
env:
2424
RUSTFLAGS: -D warnings
2525
steps:
26-
- uses: taiki-e/cache-cargo-install-action@v1
26+
- uses: taiki-e/cache-cargo-install-action@v2
2727
with:
2828
tool: cargo-checkmate
2929

3030
- name: Checkout repository
3131
uses: actions/checkout@v4
3232

3333
- name: Install protoc
34-
run: sudo apt-get install protobuf-compiler
34+
run: |
35+
if ! command -v protoc; then
36+
sudo apt-get install -y protobuf-compiler
37+
fi
3538
3639
- name: Run cargo checkmate
3740
run: cargo-checkmate run ${{ matrix.phase }}

.github/workflows/ci-nightly.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ jobs:
4242
android-ubuntu-integration-test-actions:
4343
strategy:
4444
matrix:
45-
abi: [ x86_64, x86, arm64-v8a, armeabi-v7a ]
45+
abi: [ x86_64, x86 ]
4646
fail-fast: false
47-
uses: zingolabs/zingo-mobile/.github/workflows/android-ubuntu-integration-test-actions.yaml@dev
47+
uses: zingolabs/zingo-mobile/.github/workflows/android-ubuntu-integration-test-ci.yaml@dev
4848
needs: [create-timestamp, android-build]
4949
with:
5050
timestamp: ${{ needs.create-timestamp.outputs.timestamp }}
@@ -61,6 +61,8 @@ jobs:
6161
cache-key: ${{ needs.create-cache-key.outputs.cache-key }}
6262

6363
ios-integration-test:
64+
strategy:
65+
fail-fast: false
6466
uses: zingolabs/zingo-mobile/.github/workflows/ios-integration-test.yaml@dev
6567
needs: [ create-timestamp, ios-build ]
6668
with:

.github/workflows/ci.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ jobs:
3535
- uses: actions-rust-lang/setup-rust-toolchain@v1
3636

3737
- name: Install protoc
38-
run: sudo apt-get install protobuf-compiler
38+
run: |
39+
if ! command -v protoc; then
40+
sudo apt-get install -y protobuf-compiler
41+
fi
3942
4043
- name: Cargo cache
4144
uses: Swatinem/rust-cache@v2

.github/workflows/coverage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
env:
1313
RUSTFLAGS: -D warnings
1414
container:
15-
image: zingodevops/ci-build:002
15+
image: zingodevops/ci-build:004
1616
options: --security-opt seccomp=unconfined
1717
steps:
1818
- name: Checkout repository

.github/workflows/test.yaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ env:
1313
jobs:
1414
build-test-artifacts:
1515
name: Build test artifacts
16+
container:
17+
image: zingodevops/ci-build:004
1618
runs-on: ubuntu-22.04
1719
if: github.event.pull_request.draft == false
1820
env:
@@ -26,11 +28,7 @@ jobs:
2628
- name: Install nextest
2729
uses: taiki-e/install-action@v2
2830
with:
29-
tool: nextest
30-
version: 0.9.78
31-
32-
- name: Install protoc
33-
run: sudo apt-get install protobuf-compiler
31+
tool: nextest@0.9.78
3432

3533
- name: Cargo cache
3634
uses: Swatinem/rust-cache@v2
@@ -52,7 +50,7 @@ jobs:
5250
env:
5351
RUSTFLAGS: -D warnings
5452
container:
55-
image: zingodevops/ci-build:002
53+
image: zingodevops/ci-build:004
5654
options: --security-opt seccomp=unconfined
5755
strategy:
5856
matrix:
@@ -77,6 +75,6 @@ jobs:
7775

7876
- name: Run tests
7977
run: |
80-
cargo nextest run --verbose --profile ci --archive-file nextest-archive.tar.zst \
78+
cargo nextest run --verbose --profile ci --retries 2 --archive-file nextest-archive.tar.zst \
8179
--workspace-remap ./ --partition count:${{ matrix.partition }}/8 ${{ env.NEXTEST-FLAGS }}
8280

0 commit comments

Comments
 (0)