Skip to content

Commit

Permalink
Merge branch 'dev' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
dorianvp committed Feb 6, 2025
2 parents bd9a552 + 4f2d43b commit b4d4b90
Show file tree
Hide file tree
Showing 127 changed files with 10,588 additions and 5,956 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/cargo-checkmate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-22.04
if: github.event.pull_request.draft == false
steps:
- uses: taiki-e/cache-cargo-install-action@v1
- uses: taiki-e/cache-cargo-install-action@v2
with:
tool: cargo-checkmate

Expand All @@ -23,15 +23,18 @@ jobs:
env:
RUSTFLAGS: -D warnings
steps:
- uses: taiki-e/cache-cargo-install-action@v1
- uses: taiki-e/cache-cargo-install-action@v2
with:
tool: cargo-checkmate

- name: Checkout repository
uses: actions/checkout@v4

- name: Install protoc
run: sudo apt-get install protobuf-compiler
run: |
if ! command -v protoc; then
sudo apt-get install -y protobuf-compiler
fi
- name: Run cargo checkmate
run: cargo-checkmate run ${{ matrix.phase }}
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/ci-nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ jobs:
android-ubuntu-integration-test-actions:
strategy:
matrix:
abi: [ x86_64, x86, arm64-v8a, armeabi-v7a ]
abi: [ x86_64, x86 ]
fail-fast: false
uses: zingolabs/zingo-mobile/.github/workflows/android-ubuntu-integration-test-actions.yaml@dev
uses: zingolabs/zingo-mobile/.github/workflows/android-ubuntu-integration-test-ci.yaml@dev
needs: [create-timestamp, android-build]
with:
timestamp: ${{ needs.create-timestamp.outputs.timestamp }}
Expand All @@ -61,6 +61,8 @@ jobs:
cache-key: ${{ needs.create-cache-key.outputs.cache-key }}

ios-integration-test:
strategy:
fail-fast: false
uses: zingolabs/zingo-mobile/.github/workflows/ios-integration-test.yaml@dev
needs: [ create-timestamp, ios-build ]
with:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ jobs:
- uses: actions-rust-lang/setup-rust-toolchain@v1

- name: Install protoc
run: sudo apt-get install protobuf-compiler
run: |
if ! command -v protoc; then
sudo apt-get install -y protobuf-compiler
fi
- name: Cargo cache
uses: Swatinem/rust-cache@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
env:
RUSTFLAGS: -D warnings
container:
image: zingodevops/ci-build:002
image: zingodevops/ci-build:004
options: --security-opt seccomp=unconfined
steps:
- name: Checkout repository
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ env:
jobs:
build-test-artifacts:
name: Build test artifacts
container:
image: zingodevops/ci-build:004
runs-on: ubuntu-22.04
if: github.event.pull_request.draft == false
env:
Expand All @@ -26,11 +28,7 @@ jobs:
- name: Install nextest
uses: taiki-e/install-action@v2
with:
tool: nextest
version: 0.9.78

- name: Install protoc
run: sudo apt-get install protobuf-compiler
tool: [email protected]

- name: Cargo cache
uses: Swatinem/rust-cache@v2
Expand All @@ -52,7 +50,7 @@ jobs:
env:
RUSTFLAGS: -D warnings
container:
image: zingodevops/ci-build:002
image: zingodevops/ci-build:004
options: --security-opt seccomp=unconfined
strategy:
matrix:
Expand All @@ -77,6 +75,6 @@ jobs:

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

0 comments on commit b4d4b90

Please sign in to comment.