From 1c57cea483c13e8bd96f77d4f006447ae798425e Mon Sep 17 00:00:00 2001 From: David Given Date: Wed, 1 May 2024 00:00:30 +0200 Subject: [PATCH] Try and debug the OSX build failure. --- .github/workflows/ccpp.yml | 118 ++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index acb6fbe8..46fc886a 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -7,22 +7,22 @@ concurrency: cancel-in-progress: true jobs: - build-linux: - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v2 - with: - repository: 'davidgiven/fluxengine' - path: 'fluxengine' - - uses: actions/checkout@v2 - with: - repository: 'davidgiven/fluxengine-testdata' - path: 'fluxengine-testdata' - - name: apt - run: | - sudo apt install libudev-dev libsqlite3-dev protobuf-compiler libwxgtk3.0-gtk3-dev libfmt-dev libprotobuf-dev wx-common - - name: make - run: CXXFLAGS="-Wp,-D_GLIBCXX_ASSERTIONS" make -j`nproc` -C fluxengine + #build-linux: + # runs-on: ubuntu-22.04 + # steps: + # - uses: actions/checkout@v2 + # with: + # repository: 'davidgiven/fluxengine' + # path: 'fluxengine' + # - uses: actions/checkout@v2 + # with: + # repository: 'davidgiven/fluxengine-testdata' + # path: 'fluxengine-testdata' + # - name: apt + # run: | + # sudo apt install libudev-dev libsqlite3-dev protobuf-compiler libwxgtk3.0-gtk3-dev libfmt-dev libprotobuf-dev wx-common + # - name: make + # run: CXXFLAGS="-Wp,-D_GLIBCXX_ASSERTIONS" make -j`nproc` -C fluxengine build-macos-current: runs-on: macos-latest @@ -38,7 +38,7 @@ jobs: - name: brew run: brew install sqlite pkg-config libusb protobuf wxwidgets fmt make coreutils dylibbundler libjpeg - name: make - run: gmake -j`nproc` -C fluxengine + run: gmake -j`nproc` -C fluxengine V=1 - name: Upload build artifacts uses: actions/upload-artifact@v2 @@ -46,52 +46,52 @@ jobs: name: ${{ github.event.repository.name }}.${{ github.sha }} path: fluxengine/FluxEngine.pkg - build-windows: - runs-on: windows-latest + #build-windows: + # runs-on: windows-latest - steps: - - name: setup WSL - run: | - curl -L https://github.com/WhitewaterFoundry/Fedora-Remix-for-WSL/releases/download/39.0.1/Fedora-Remix-for-WSL-SL_39.0.1.0_x64_arm64.msixbundle -o fedora.msixbundle - unzip fedora.msixbundle Fedora-Remix-for-WSL-SL_39.0.1.0_x64.msix - unzip Fedora-Remix-for-WSL-SL_39.0.1.0_x64.msix install.tar.gz - wsl --update - wsl --import fedora fedora install.tar.gz - wsl --set-default fedora - wsl sh -c 'dnf -y install https://github.com/rpmsphere/noarch/raw/master/r/rpmsphere-release-38-1.noarch.rpm' - wsl sh -c 'dnf -y install --setop=install_weak_deps=False gcc gcc-c++ protobuf-c-compiler protobuf-devel fmt-devel systemd-devel sqlite-devel wxGTK-devel mingw32-gcc mingw32-gcc-c++ mingw32-zlib-static mingw32-protobuf-static mingw32-sqlite-static mingw32-wxWidgets3-static mingw32-libpng-static mingw32-libjpeg-static mingw32-libtiff-static mingw32-nsis png2ico' + # steps: + # - name: setup WSL + # run: | + # curl -L https://github.com/WhitewaterFoundry/Fedora-Remix-for-WSL/releases/download/39.0.1/Fedora-Remix-for-WSL-SL_39.0.1.0_x64_arm64.msixbundle -o fedora.msixbundle + # unzip fedora.msixbundle Fedora-Remix-for-WSL-SL_39.0.1.0_x64.msix + # unzip Fedora-Remix-for-WSL-SL_39.0.1.0_x64.msix install.tar.gz + # wsl --update + # wsl --import fedora fedora install.tar.gz + # wsl --set-default fedora + # wsl sh -c 'dnf -y install https://github.com/rpmsphere/noarch/raw/master/r/rpmsphere-release-38-1.noarch.rpm' + # wsl sh -c 'dnf -y install --setop=install_weak_deps=False gcc gcc-c++ protobuf-c-compiler protobuf-devel fmt-devel systemd-devel sqlite-devel wxGTK-devel mingw32-gcc mingw32-gcc-c++ mingw32-zlib-static mingw32-protobuf-static mingw32-sqlite-static mingw32-wxWidgets3-static mingw32-libpng-static mingw32-libjpeg-static mingw32-libtiff-static mingw32-nsis png2ico' - - name: fix line endings - run: | - git config --global core.autocrlf false - git config --global core.eol lf - - - uses: actions/checkout@v4 - with: - repository: 'davidgiven/fluxengine' - path: 'fluxengine' + # - name: fix line endings + # run: | + # git config --global core.autocrlf false + # git config --global core.eol lf + # + # - uses: actions/checkout@v4 + # with: + # repository: 'davidgiven/fluxengine' + # path: 'fluxengine' - - uses: actions/checkout@v4 - with: - repository: 'davidgiven/fluxengine-testdata' - path: 'fluxengine-testdata' + # - uses: actions/checkout@v4 + # with: + # repository: 'davidgiven/fluxengine-testdata' + # path: 'fluxengine-testdata' - - name: run - run: | - wsl sh -c 'make -C fluxengine BUILDTYPE=windows -j$(nproc)' + # - name: run + # run: | + # wsl sh -c 'make -C fluxengine BUILDTYPE=windows -j$(nproc)' - - name: nsis - run: | - wsl sh -c 'cd fluxengine && strip fluxengine.exe -o fluxengine-stripped.exe' - wsl sh -c 'cd fluxengine && strip fluxengine-gui.exe -o fluxengine-gui-stripped.exe' - wsl sh -c 'cd fluxengine && makensis -v2 -nocd -dOUTFILE=fluxengine-installer.exe extras/windows-installer.nsi' + # - name: nsis + # run: | + # wsl sh -c 'cd fluxengine && strip fluxengine.exe -o fluxengine-stripped.exe' + # wsl sh -c 'cd fluxengine && strip fluxengine-gui.exe -o fluxengine-gui-stripped.exe' + # wsl sh -c 'cd fluxengine && makensis -v2 -nocd -dOUTFILE=fluxengine-installer.exe extras/windows-installer.nsi' - - name: zip - run: | - wsl sh -c 'cd fluxengine && zip -9 fluxengine-windows.zip fluxengine.exe fluxengine-gui.exe upgrade-flux-file.exe brother120tool.exe brother240tool.exe FluxEngine.cydsn/CortexM3/ARM_GCC_541/Release/FluxEngine.hex fluxengine-installer.exe' + # - name: zip + # run: | + # wsl sh -c 'cd fluxengine && zip -9 fluxengine-windows.zip fluxengine.exe fluxengine-gui.exe upgrade-flux-file.exe brother120tool.exe brother240tool.exe FluxEngine.cydsn/CortexM3/ARM_GCC_541/Release/FluxEngine.hex fluxengine-installer.exe' - - name: Upload build artifacts - uses: actions/upload-artifact@v2 - with: - name: ${{ github.event.repository.name }}.${{ github.sha }} - path: fluxengine/fluxengine-windows.zip + # - name: Upload build artifacts + # uses: actions/upload-artifact@v2 + # with: + # name: ${{ github.event.repository.name }}.${{ github.sha }} + # path: fluxengine/fluxengine-windows.zip