Skip to content

Commit 505a16b

Browse files
Use default arch in CI (#135)
* use default arch in CI * use macos-13 for Julia v1.6 * set JULIA_P4EST_TEST * fix JULIA_P4EST_TEST * don't run custom MPI on macOS
1 parent c8d680f commit 505a16b

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

.github/workflows/Downgrade.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
downgrade_test:
2828
if: "!contains(github.event.head_commit.message, 'skip ci')"
2929
# We could also include the Julia version as in
30-
# name: ${{ matrix.trixi_test }} - ${{ matrix.os }} - Julia ${{ matrix.version }} - ${{ matrix.arch }} - ${{ github.event_name }}
30+
# name: ${{ matrix.trixi_test }} - ${{ matrix.os }} - Julia ${{ matrix.version }} - ${{ github.event_name }}
3131
# to be more specific. However, that requires us updating the required CI tests whenever we update Julia.
32-
name: Downgrade ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
32+
name: Downgrade ${{ matrix.os }} - ${{ github.event_name }}
3333
runs-on: ${{ matrix.os }}
3434
strategy:
3535
fail-fast: false
@@ -40,14 +40,11 @@ jobs:
4040
# - 'nightly'
4141
os:
4242
- ubuntu-latest
43-
arch:
44-
- x64
4543
steps:
4644
- uses: actions/checkout@v4
4745
- uses: julia-actions/setup-julia@v2
4846
with:
4947
version: ${{ matrix.version }}
50-
arch: ${{ matrix.arch }}
5148
- run: julia -e 'using InteractiveUtils; versioninfo(verbose=true)'
5249
- uses: julia-actions/cache@v2
5350
- uses: julia-actions/julia-downgrade-compat@v1

.github/workflows/ci.yml

+12-7
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ jobs:
4040
- ubuntu-latest
4141
- macos-latest
4242
- windows-latest
43-
arch:
44-
- x64
4543
JULIA_P4EST_TEST:
4644
- P4EST_JLL_MPI_DEFAULT
4745
- P4EST_CUSTOM_MPI_CUSTOM
@@ -59,6 +57,14 @@ jobs:
5957
JULIA_P4EST_TEST: P4EST_CUSTOM_MPI_CUSTOM
6058
- os: windows-latest
6159
JULIA_P4EST_TEST: P4EST_CUSTOM_MPI_CUSTOM
60+
# macos-14 doesn't support Julia v1.6,
61+
# cf. https://discourse.julialang.org/t/how-to-fix-github-actions-ci-failures-with-julia-1-6-or-1-7-on-macos-latest-and-macos-14/117019
62+
- os: macos-latest
63+
version: '1.6'
64+
include:
65+
- os: macos-13 # Intel
66+
version: '1.6'
67+
JULIA_P4EST_TEST: P4EST_JLL_MPI_DEFAULT
6268
steps:
6369
- uses: actions/checkout@v4
6470
- name: Set p4est release to run tests against
@@ -97,7 +103,6 @@ jobs:
97103
- uses: julia-actions/setup-julia@v2
98104
with:
99105
version: ${{ matrix.version }}
100-
arch: ${{ matrix.arch }}
101106
show-versioninfo: true
102107
- uses: julia-actions/cache@v2
103108
- name: Install custom MPI library for testing
@@ -139,7 +144,7 @@ jobs:
139144
# - uses: coverallsapp/github-action@master
140145
# with:
141146
# github-token: ${{ secrets.GITHUB_TOKEN }}
142-
# flag-name: run-${{ matrix.JULIA_P4EST_TEST }}-${{ matrix.os }}-${{ matrix.version }}-${{ matrix.arch }}-${{ github.run_id }}
147+
# flag-name: run-${{ join(matrix.*, '-') }}
143148
# parallel: true
144149
# path-to-lcov: ./lcov.info
145150
# Instead, we use a more tedious approach:
@@ -148,11 +153,11 @@ jobs:
148153
# - Upload only the merged coverage report to Coveralls
149154
- shell: bash
150155
run: |
151-
cp ./lcov.info ./lcov-${{ matrix.JULIA_P4EST_TEST }}-${{ matrix.os }}-${{ matrix.version }}-${{ matrix.arch }}.info
156+
cp ./lcov.info ./lcov-${{ matrix.JULIA_P4EST_TEST }}-${{ matrix.os }}-${{ matrix.version }}.info
152157
- uses: actions/upload-artifact@v4
153158
with:
154-
name: lcov-${{ matrix.JULIA_P4EST_TEST }}-${{ matrix.os }}-${{ matrix.version }}-${{ matrix.arch }}
155-
path: ./lcov-${{ matrix.JULIA_P4EST_TEST }}-${{ matrix.os }}-${{ matrix.version }}-${{ matrix.arch }}.info
159+
name: lcov-${{ matrix.JULIA_P4EST_TEST }}-${{ matrix.os }}-${{ matrix.version }}
160+
path: ./lcov-${{ matrix.JULIA_P4EST_TEST }}-${{ matrix.os }}-${{ matrix.version }}.info
156161

157162
finish:
158163
needs: test

0 commit comments

Comments
 (0)