diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1ac30df..ee683b0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,9 +8,7 @@ jobs: self-test: strategy: matrix: - # macos has weird SIGBUS errors in github that I cannot reproduce on aarch64-darwin... - #os: [ ubuntu-latest, macos-latest ] - os: [ ubuntu-latest ] + os: [ ubuntu-latest, macos-latest ] nom: [ "", "--no-nom"] runs-on: ${{ matrix.os }} steps: @@ -35,8 +33,7 @@ jobs: tests: strategy: matrix: - #os: [ ubuntu-latest, macos-latest ] - os: [ ubuntu-latest ] + os: [ ubuntu-latest, macos-latest ] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.mergify.yml b/.mergify.yml index 92532ba..d859942 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,8 +1,11 @@ queue_rules: - name: default merge_conditions: + - check-success=self-test (macos-latest) + - check-success=self-test (macos-latest, --no-nom) - check-success=self-test (ubuntu-latest) - check-success=self-test (ubuntu-latest, --no-nom) + - check-success=tests (macos-latest) - check-success=tests (ubuntu-latest) defaults: actions: