Fix macOS builds (#58)

* Run macos runners on 13 instead of latest macos-latest (14) runners are arm64 only. actions/runner-images#9741 Running the x86_64 build on arm64 gives the following error: `[FATAL]: Currently canadian builds require a x86_64 build system Arm builds also fail for a different reason.` * install texinfo on mac
wpilibsuite · Jun 16, 2024 · 68268b7 · 68268b7
1 parent b9dca8c
commit 68268b7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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,
             },
@@ -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
@@ -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,
             },
@@ -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
@@ -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,
             },
@@ -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
@@ -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,
             },
@@ -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

diff --git a/.github/workflows/ci.yml.jinja b/.github/workflows/ci.yml.jinja
@@ -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,
             },
@@ -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