From 922ff807e59b4c998e46517059cbfe07c765e5ef Mon Sep 17 00:00:00 2001 From: Chengyu HAN Date: Sat, 14 Dec 2024 00:20:22 +0800 Subject: [PATCH 1/9] ci: run on macos-x64 --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index aeeb874..558b880 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -18,7 +18,7 @@ jobs: - 'nightly' os: - ubuntu-latest - - macOS-latest + - macos-13 # Intel - windows-latest arch: - x64 From cc4f584b1f69700e306ebdd232d3df06656f0b40 Mon Sep 17 00:00:00 2001 From: Chengyu HAN Date: Sat, 14 Dec 2024 10:04:46 +0800 Subject: [PATCH 2/9] ci: test with macos-aarch64 --- .github/workflows/CI.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 558b880..b822ab9 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -22,6 +22,17 @@ jobs: - windows-latest arch: - x64 + include: + # macos-latest -> Apple Silicon + - os: macos-latest + julia-arch: 'aarch64' + julia-version: '1.0' + - os: macos-latest + julia-arch: 'aarch64' + julia-version: '1' + - os: macos-latest + julia-arch: 'aarch64' + julia-version: 'nightly' steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 From 802c9fed55c7f4610fa1527b12f063073f3176e7 Mon Sep 17 00:00:00 2001 From: Chengyu HAN Date: Sat, 14 Dec 2024 10:10:58 +0800 Subject: [PATCH 3/9] ci: fix typo in build matrix --- .github/workflows/CI.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b822ab9..78d1c5f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -25,14 +25,14 @@ jobs: include: # macos-latest -> Apple Silicon - os: macos-latest - julia-arch: 'aarch64' - julia-version: '1.0' + arch: 'aarch64' + version: '1.0' - os: macos-latest - julia-arch: 'aarch64' - julia-version: '1' + arch: 'aarch64' + version: '1' - os: macos-latest - julia-arch: 'aarch64' - julia-version: 'nightly' + arch: 'aarch64' + version: 'nightly' steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 From 65cd70a626451670350313bb8c006f39b099795a Mon Sep 17 00:00:00 2001 From: Chengyu HAN Date: Sat, 14 Dec 2024 10:20:04 +0800 Subject: [PATCH 4/9] ci: test macos-latest with lts > Julia 1.6 and 1.7 do not have native binaries available for Apple Silicon macOS. --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 78d1c5f..0563f43 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -23,10 +23,10 @@ jobs: arch: - x64 include: - # macos-latest -> Apple Silicon + # macos-latest -> Apple Silicon (Need julia >= v1.8) - os: macos-latest arch: 'aarch64' - version: '1.0' + version: 'lts' - os: macos-latest arch: 'aarch64' version: '1' From 610ae7537556a3afbaf17ca5d696bbafe5b5bf77 Mon Sep 17 00:00:00 2001 From: Chengyu HAN Date: Sat, 14 Dec 2024 10:58:01 +0800 Subject: [PATCH 5/9] ci: fix deprecated arg `file` --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0563f43..97e3435 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,4 +47,4 @@ jobs: with: token: ${{ secrets.CODECOV_TOKEN }} # required fail_ci_if_error: true - file: lcov.info + files: lcov.info From a88c00e7611725bdecb6596db7f0fe3ce63a03a4 Mon Sep 17 00:00:00 2001 From: Chengyu HAN Date: Sat, 14 Dec 2024 10:59:30 +0800 Subject: [PATCH 6/9] README: update codecov badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 11ad15a..bdd6a01 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ A general framework for fast Fourier transforms (FFTs) in Julia. [![GHA](https://github.com/JuliaMath/AbstractFFTs.jl/workflows/CI/badge.svg)](https://github.com/JuliaMath/AbstractFFTs.jl/actions?query=workflow%3ACI+branch%3Amaster) -[![Codecov](http://codecov.io/github/JuliaMath/AbstractFFTs.jl/coverage.svg?branch=master)](http://codecov.io/github/JuliaMath/AbstractFFTs.jl?branch=master) +[![Codecov](https://codecov.io/github/JuliaMath/AbstractFFTs.jl/graph/badge.svg?token=ZJrE86Hpz7)](https://codecov.io/github/JuliaMath/AbstractFFTs.jl) [![Aqua QA](https://raw.githubusercontent.com/JuliaTesting/Aqua.jl/master/badge.svg)](https://github.com/JuliaTesting/Aqua.jl) Documentation: From e95593df23b524cd2209224e3d60caa3c2b8ecca Mon Sep 17 00:00:00 2001 From: Chengyu Han Date: Wed, 18 Dec 2024 08:57:26 +0800 Subject: [PATCH 7/9] Apply suggestions from code review Co-authored-by: David Widmann --- .github/workflows/CI.yml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 97e3435..64886d4 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -18,21 +18,14 @@ jobs: - 'nightly' os: - ubuntu-latest - - macos-13 # Intel + - macos-latest # Apple silicon - windows-latest - arch: - - x64 - include: - # macos-latest -> Apple Silicon (Need julia >= v1.8) - - os: macos-latest - arch: 'aarch64' - version: 'lts' + exclude: - os: macos-latest - arch: 'aarch64' - version: '1' - - os: macos-latest - arch: 'aarch64' - version: 'nightly' + version: '1.0' + include: + - os: macos-13 # Intel + version: '1.0' steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 From ee10413d2b99217366596e837005a2b7ff68ee65 Mon Sep 17 00:00:00 2001 From: Chengyu HAN Date: Wed, 18 Dec 2024 08:58:13 +0800 Subject: [PATCH 8/9] ci: Remove matrix.arch --- .github/workflows/CI.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 64886d4..aea8043 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -31,7 +31,6 @@ jobs: - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} - arch: ${{ matrix.arch }} - uses: julia-actions/cache@v2 - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1 From 2f29d9b0960fd6e02d439756a24d2b206146ec82 Mon Sep 17 00:00:00 2001 From: Chengyu HAN Date: Wed, 18 Dec 2024 15:43:45 +0800 Subject: [PATCH 9/9] ci: Remove matrix.arch from the name of the job --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index aea8043..347373a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -7,7 +7,7 @@ on: tags: '*' jobs: test: - name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} + name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ github.event_name }} runs-on: ${{ matrix.os }} strategy: fail-fast: false