Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix macOS builds #58

Merged
merged 4 commits into from
Jun 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,13 @@ jobs:
},
{
os-cfg: macos_x86_64,
runner: macos-latest,
runner: macos-13,
container: "",
testable: true,
},
{
os-cfg: macos_arm64,
runner: macos-latest,
runner: macos-13,
container: "",
testable: false,
},
Expand All @@ -146,7 +146,7 @@ jobs:
- uses: actions/checkout@v3
- name: Prep MacOS
if: contains(matrix.host.runner, 'macos')
run: brew install rsync xz gmp mpfr libmpc isl
run: brew install rsync xz gmp mpfr libmpc isl texinfo
- uses: actions/download-artifact@v3
with:
name: roborio-academic-cortexa9_vfpv3-sysroot
Expand Down Expand Up @@ -201,13 +201,13 @@ jobs:
},
{
os-cfg: macos_x86_64,
runner: macos-latest,
runner: macos-13,
container: "",
testable: true,
},
{
os-cfg: macos_arm64,
runner: macos-latest,
runner: macos-13,
container: "",
testable: false,
},
Expand All @@ -224,7 +224,7 @@ jobs:
- uses: actions/checkout@v3
- name: Prep MacOS
if: contains(matrix.host.runner, 'macos')
run: brew install rsync xz gmp mpfr libmpc isl
run: brew install rsync xz gmp mpfr libmpc isl texinfo
- uses: actions/download-artifact@v3
with:
name: bullseye-armhf-sysroot
Expand Down Expand Up @@ -272,13 +272,13 @@ jobs:
},
{
os-cfg: macos_x86_64,
runner: macos-latest,
runner: macos-13,
container: "",
testable: true,
},
{
os-cfg: macos_arm64,
runner: macos-latest,
runner: macos-13,
container: "",
testable: false,
},
Expand All @@ -295,7 +295,7 @@ jobs:
- uses: actions/checkout@v3
- name: Prep MacOS
if: contains(matrix.host.runner, 'macos')
run: brew install rsync xz gmp mpfr libmpc isl
run: brew install rsync xz gmp mpfr libmpc isl texinfo
- uses: actions/download-artifact@v3
with:
name: bullseye-arm64-sysroot
Expand Down Expand Up @@ -343,13 +343,13 @@ jobs:
},
{
os-cfg: macos_x86_64,
runner: macos-latest,
runner: macos-13,
container: "",
testable: true,
},
{
os-cfg: macos_arm64,
runner: macos-latest,
runner: macos-13,
container: "",
testable: false,
},
Expand All @@ -366,7 +366,7 @@ jobs:
- uses: actions/checkout@v3
- name: Prep MacOS
if: contains(matrix.host.runner, 'macos')
run: brew install rsync xz gmp mpfr libmpc isl
run: brew install rsync xz gmp mpfr libmpc isl texinfo
- uses: actions/download-artifact@v3
with:
name: raspi-bullseye-armhf-sysroot
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ jobs:
},
{
os-cfg: macos_x86_64,
runner: macos-latest,
runner: macos-13,
container: "",
testable: true,
},
{
os-cfg: macos_arm64,
runner: macos-latest,
runner: macos-13,
container: "",
testable: false,
},
Expand All @@ -80,7 +80,7 @@ jobs:
- uses: actions/checkout@v3
- name: Prep MacOS
if: contains(matrix.host.runner, 'macos')
run: brew install rsync xz gmp mpfr libmpc isl
run: brew install rsync xz gmp mpfr libmpc isl texinfo
- uses: actions/download-artifact@v3
with:
name: {{ target.os }}-{{ target.port }}-sysroot
Expand Down
Loading