From 44d5754b53a8a6fa443c50bafc71470bbb831cfe Mon Sep 17 00:00:00 2001 From: Geoff Hutchison Date: Tue, 10 Sep 2024 21:13:09 -0400 Subject: [PATCH 1/4] Check on Mac DMG binary Signed-off-by: Geoff Hutchison --- .github/workflows/build_cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 3eb9b6bee6..5b2b5dd465 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -317,7 +317,7 @@ jobs: continue-on-error: true - name: Setup tmate session - if: ${{ failure() }} + if: runner.os == 'macOS' uses: mxschmitt/action-tmate@v3 - name: Upload From 14ab3000816e955fdbc395dc214fc29435695704 Mon Sep 17 00:00:00 2001 From: Geoff Hutchison Date: Tue, 10 Sep 2024 21:52:27 -0400 Subject: [PATCH 2/4] Make sure packages are built on Mac Signed-off-by: Geoff Hutchison --- .github/workflows/build_cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 5b2b5dd465..53a08678cf 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -264,7 +264,7 @@ jobs: fi # password exists - name: Create Mac and Windows Packages - if: matrix.config.os == 'windows-latest' || matrix.config.os == 'macos-latest' + if: matrix.config.os == 'windows-latest' || runner.os == 'macOS' shell: bash run: | if [ -z "${P12_PASSWORD}" ]; then From 2ed42f1909923af34e3461875017ab2a84abc44f Mon Sep 17 00:00:00 2001 From: Geoff Hutchison Date: Tue, 10 Sep 2024 22:01:15 -0400 Subject: [PATCH 3/4] Fixup CentOS archives to build wheels Signed-off-by: Geoff Hutchison --- .github/workflows/build_wheels.yml | 2 +- scripts/github-actions/repair-linux.sh | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 scripts/github-actions/repair-linux.sh diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index b48ec55200..9593e0cdad 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -13,7 +13,7 @@ env: # Need to do some setup before repairing the wheel on linux... CIBW_REPAIR_WHEEL_COMMAND_LINUX: bash scripts/github-actions/repair_command_linux.sh - CIBW_BEFORE_ALL_LINUX: yum install -y git eigen3-devel + CIBW_BEFORE_ALL_LINUX: bash scripts/github-actions/repair-linux.sh # Specify eigen location for windows CIBW_ENVIRONMENT_WINDOWS: "EXTRA_CMAKE_ARGS=-DEIGEN3_INCLUDE_DIR:PATH=/c/eigen" diff --git a/scripts/github-actions/repair-linux.sh b/scripts/github-actions/repair-linux.sh new file mode 100644 index 0000000000..624e596d79 --- /dev/null +++ b/scripts/github-actions/repair-linux.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +set -ev + +# CentOS 7 is EOL so mirror.centos.org is offline +# https://serverfault.com/a/1161921 + +sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo +sed -i s/^#.*baseurl=http/baseurl=https/g /etc/yum.repos.d/*.repo +sed -i s/^mirrorlist=http/#mirrorlist=https/g /etc/yum.repos.d/*.repo + +yum install -y git eigen3-devel From 9fed80418bdd96c28c92b7da755ae2e9f5b5c57d Mon Sep 17 00:00:00 2001 From: Geoff Hutchison Date: Tue, 10 Sep 2024 23:20:48 -0400 Subject: [PATCH 4/4] Switch tmate back to if failure Signed-off-by: Geoff Hutchison --- .github/workflows/build_cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 53a08678cf..997887a196 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -317,7 +317,7 @@ jobs: continue-on-error: true - name: Setup tmate session - if: runner.os == 'macOS' + if: ${{ failure() }} uses: mxschmitt/action-tmate@v3 - name: Upload