Skip to content

Commit

Permalink
Merge pull request #505 from matomo-org/Show-OS-in-CI
Browse files Browse the repository at this point in the history
Show OS in CI
  • Loading branch information
hannesa2 authored Jun 6, 2024
2 parents f4efa91 + beb2dbb commit df54bc7
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 9 deletions.
31 changes: 23 additions & 8 deletions .github/workflows/pull-request-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,12 @@ jobs:
cat ${GITHUB_OUTPUT}
buildTest:
name: Build & Run Unit-Tests
runs-on: ubuntu-latest
name: Build & Unit-Tests
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest ]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -48,7 +52,11 @@ jobs:
run: bash <(curl -s https://codecov.io/bash)
Check:
name: Check
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest ]
needs:
- env-job
steps:
Expand All @@ -70,8 +78,15 @@ jobs:
name: Matomo-Lint-${{ needs.env-job.outputs.modified-branch-name }}
path: tracker/build/reports/lint-results.html

EspressoTest:
runs-on: macOS-13
Espresso:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ macOS-13 ]
api: [ 30 ]
abi: [ x86_64 ]
tag: [ default ]
needs:
- env-job
steps:
Expand All @@ -95,9 +110,9 @@ jobs:
uses: hannesa2/action-android/[email protected]
with:
cmd: ./gradlew cAT --continue
api: 30
tag: default
abi: x86_64
api: ${{ matrix.api }}
tag: ${{ matrix.tag }}
abi: ${{ matrix.abi }}
cmdOptions: -noaudio -no-boot-anim -no-window
- name: Archive Espresso results
uses: actions/upload-artifact@v4
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ on:

jobs:
release:
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest ]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down

0 comments on commit df54bc7

Please sign in to comment.