Skip to content

Commit 82ab587

Browse files
author
Release Manager
committed
gh-37919: Upgrades and configure fixes for macOS arm64 <!-- ^ Please provide a concise and informative title. --> <!-- ^ Don't put issue numbers in the title, do this in the PR description below. --> <!-- ^ For example, instead of "Fixes #12345" use "Introduce new method to calculate 1 + 2". --> <!-- v Describe your changes below in detail. --> <!-- v Why is this change required? What problem does it solve? --> <!-- v If this PR resolves an open issue, please link to it here. For example, "Fixes #12345". --> Also - update for updated GitHub macOS runner labels ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [x] The title is concise and informative. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation and checked the documentation preview. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - #12345: short description why this is a dependency --> <!-- - #34567: ... --> - Depends on #37726 (merged here to resolve merge conflict) URL: #37919 Reported by: Matthias Köppe Reviewer(s):
2 parents e926e64 + dbfe9a2 commit 82ab587

25 files changed

+41
-94
lines changed

‎.github/workflows/ci-macos.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
fail-fast: false
110110
max-parallel: 4
111111
matrix:
112-
os: [ macos-11, macos-12, macos-14 ]
112+
os: [ macos-12, macos-13, macos-14 ]
113113
tox_system_factor: [macos-nobootstrap]
114114
tox_packages_factor: [minimal]
115115
xcode_version_factor: [default]

‎.github/workflows/macos.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,19 @@ on:
1919
type: string
2020
# System configuration
2121
osversion_xcodeversion_toxenv_tuples:
22-
# As of 2024-02, "runs-on: macos-latest" is macos-12.
23-
# and "runs-on: macos-14" selects the new M1 runners.
22+
# As of 2024-05, "runs-on: macos-latest" and "runs-on: macos-14" selects the new M1 runners.
2423
# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
2524
description: 'Stringified JSON object'
2625
default: >-
27-
[["11", "xcode_13.2.1", "homebrew-macos-usrlocal-minimal"],
28-
["12", "", "homebrew-macos-usrlocal-minimal"],
26+
[["12", "", "homebrew-macos-usrlocal-minimal"],
2927
["12", "", "homebrew-macos-usrlocal-standard"],
3028
["12", "", "homebrew-macos-usrlocal-python3_xcode-standard"],
3129
["12", "", "homebrew-macos-usrlocal-maximal"],
3230
["13", "xcode_15.0", "homebrew-macos-usrlocal-standard"],
33-
["14", "", "homebrew-macos-opthomebrew-standard"],
34-
["latest", "", "conda-forge-macos-minimal"],
35-
["latest", "", "conda-forge-macos-standard"],
36-
["14", "", "conda-forge-macos-standard"]]
31+
["latest", "", "homebrew-macos-opthomebrew-standard"],
32+
["13", "", "conda-forge-macos-minimal"],
33+
["13", "", "conda-forge-macos-standard"],
34+
["latest", "", "conda-forge-macos-standard"]]
3735
type: string
3836
extra_sage_packages:
3937
description: 'Extra Sage packages to install as system packages'

‎build/pkgs/brial/spkg-install.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# is installed by the "sage_brial" spkg.
55
#
66
cd src
7+
cp "$SAGE_ROOT"/config/config.* .
78
sdh_configure \
89
--enable-shared --disable-static \
910
--with-boost-unit-test-framework=no

‎build/pkgs/cliquer/spkg-install.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
cd src
22

3+
cp "$SAGE_ROOT"/config/config.* .
34
sdh_configure
45
sdh_make
56
sdh_make_install

‎build/pkgs/gengetopt/spkg-build.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
cd src
2+
cp "$SAGE_ROOT"/config/config.* build-aux/
23
sdh_configure
34

45
# Don't run "make" at the top-level because the documentation build

‎build/pkgs/givaro/spkg-install.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ if [ "$SAGE_FAT_BINARY" = yes ]; then
99
GIVARO_CONFIGURE="--disable-sse --disable-sse2 --disable-sse3 --disable-ssse3 --disable-sse41 --disable-sse42 --disable-fma --disable-fma4 --disable-avx --disable-avx2 $GIVARO_CONFIGURE"
1010
fi
1111

12+
cp "$SAGE_ROOT"/config/config.* build-aux/
1213
sdh_configure $SAGE_CONFIGURE_GMP --enable-shared $GIVARO_CONFIGURE
1314
sdh_make
1415
sdh_make_install

‎build/pkgs/libbraiding/spkg-install.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
cd src
2+
cp "$SAGE_ROOT"/config/config.* build-aux/
23
sdh_configure $LIBBRAIDING_CONFIGURE
34
sdh_make
45
sdh_make_install -j1

‎build/pkgs/libgd/spkg-install.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cd src
22

33
export CFLAGS="-g $CFLAGS"
44

5+
cp "$SAGE_ROOT"/config/config.* config/
56
# We explicitly disable X, fontconfig, and support of various formats/libraries.
67
# We only need png.
78
# see https://github.com/libgd/libgd/blob/master/configure.ac

‎build/pkgs/libhomfly/spkg-install.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
cd src
2+
cp "$SAGE_ROOT"/config/config.* build-aux/
23
sdh_configure $LIBHOMFLY_CONFIGURE
34
sdh_make
45
sdh_make_install -j1

‎build/pkgs/lrcalc/spkg-install.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
cd src
22

3+
cp "$SAGE_ROOT"/config/config.* .
34
sdh_configure
45
sdh_make
56
sdh_make_install

0 commit comments

Comments
 (0)