From a53730fe10608e8c060b35b308f71dae6ae9940d Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Mon, 4 Mar 2024 16:59:00 +1300 Subject: [PATCH 1/4] Test on Apple Silicon --- .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 6fdd3d0..51e32cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: version: ['1'] - os: [ubuntu-latest, macOS-latest, windows-latest] + os: [ubuntu-latest, macOS-latest, macos-14, windows-latest] arch: [x64] # HiGHS segfaults on 32-bit. # Upstream is https://github.com/ERGO-Code/HiGHS/issues/769 From 7c5f9e1758aa19e4f73a014fc7116c697a917687 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Mon, 4 Mar 2024 18:00:47 +1300 Subject: [PATCH 2/4] Update .github/workflows/ci.yml --- .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 51e32cc..bc9838a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - version: ['1'] + version: ['1.6', '1'] os: [ubuntu-latest, macOS-latest, macos-14, windows-latest] arch: [x64] # HiGHS segfaults on 32-bit. From 89ffeebd90ebb299eca91b2bd0c1b52cae01c8c6 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Mon, 4 Mar 2024 19:09:56 +1300 Subject: [PATCH 3/4] Update ci.yml --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc9838a..3faf0b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,8 +12,11 @@ jobs: fail-fast: false matrix: version: ['1.6', '1'] - os: [ubuntu-latest, macOS-latest, macos-14, windows-latest] + os: [ubuntu-latest, macOS-latest, windows-latest] arch: [x64] + include: + - os: macos-14 + arch: aarch64 # HiGHS segfaults on 32-bit. # Upstream is https://github.com/ERGO-Code/HiGHS/issues/769 # but we decided investigating was a low priority until it From e8434fa54c24ee6081c1f4204eb4d0207b530f22 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Mon, 4 Mar 2024 19:10:56 +1300 Subject: [PATCH 4/4] Update ci.yml --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3faf0b0..1c7169c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,8 @@ jobs: os: [ubuntu-latest, macOS-latest, windows-latest] arch: [x64] include: - - os: macos-14 + - version: '1' + os: macos-14 arch: aarch64 # HiGHS segfaults on 32-bit. # Upstream is https://github.com/ERGO-Code/HiGHS/issues/769