From 7d1a9caee0f654861995f67eb5ee1834ed4dd02a Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Fri, 17 Feb 2023 22:06:12 +1000 Subject: [PATCH] fix(gh): Workaround bug in GitHub runner for Mac Cpn action (#3203) * fix(gh): Mac Cpn action dependency reorder * Another possible fix --- .github/workflows/macosx_cpn.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/macosx_cpn.yml b/.github/workflows/macosx_cpn.yml index dd6a0747b..ff210f3e6 100644 --- a/.github/workflows/macosx_cpn.yml +++ b/.github/workflows/macosx_cpn.yml @@ -70,12 +70,8 @@ jobs: - name: Install dependencies run: python3 -m pip install --upgrade pip Pillow lz4 clang - - name: Install dfu-util - run: wget https://downloads.sourceforge.net/project/dfu-util/dfu-util-0.9.tar.gz && - tar xfv dfu-util-0.9.tar.gz && - cd dfu-util-0.9 && - ./configure && - make install + - name: Patch GitHub macOS build + run: brew install pkg-config - name: Install libusb run: wget https://github.com/libusb/libusb/releases/download/v1.0.20/libusb-1.0.20.tar.bz2 && @@ -86,6 +82,13 @@ jobs: make install && cd .. + - name: Install dfu-util + run: wget https://downloads.sourceforge.net/project/dfu-util/dfu-util-0.9.tar.gz && + tar xfv dfu-util-0.9.tar.gz && + cd dfu-util-0.9 && + ./configure && + make install + - name: Install libsdl run: wget https://www.libsdl.org/release/SDL-1.2.15.tar.gz && tar xfv SDL-1.2.15.tar.gz &&