From fac9c23103b9aeee90e99b04ab0c3b1ee2ae6ec2 Mon Sep 17 00:00:00 2001 From: SChernykh Date: Wed, 23 Aug 2023 15:41:43 +0200 Subject: [PATCH] Fixed LTO in macOS builds --- .github/workflows/c-cpp.yml | 44 ++++++++++++++++++++------------- .github/workflows/test-sync.yml | 2 +- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index a29c32f..80e600e 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -452,11 +452,14 @@ jobs: build-macos: timeout-minutes: 20 - runs-on: ${{ matrix.os }} + runs-on: ${{ matrix.config.os }} strategy: matrix: - os: [macos-11, macos-12] + config: + - {os: "macos-11", xcode: "12.5.1"} + - {os: "macos-12", xcode: "14.2"} + - {os: "macos-13", xcode: "15.0"} steps: - name: Checkout repository @@ -465,12 +468,14 @@ jobs: submodules: recursive - name: Install dependencies - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake + run: | + HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake + sudo xcode-select -s /Applications/Xcode_${{ matrix.config.xcode }}.app - name: Build libcurl run: | cd external/src/curl - cmake . -DCMAKE_C_FLAGS="-Os" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF + cmake . -DCMAKE_C_FLAGS="-Os -flto" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF make -j3 cd lib && mkdir .libs && cp libcurl.a .libs @@ -479,7 +484,7 @@ jobs: cd external/src/libuv mkdir build cd build - cmake .. -DCMAKE_C_FLAGS='-Os' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF + cmake .. -DCMAKE_C_FLAGS='-Os -flto' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF make -j3 - name: Build libzmq @@ -487,14 +492,14 @@ jobs: cd external/src/libzmq mkdir build cd build - cmake .. -DCMAKE_C_FLAGS='-Os' -DCMAKE_CXX_FLAGS='-Os' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF + cmake .. -DCMAKE_C_FLAGS='-Os -flto' -DCMAKE_CXX_FLAGS='-Os -flto' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF make -j3 - name: Build p2pool run: | mkdir build cd build - cmake .. -DSTATIC_LIBS=ON -DWITH_LTO=OFF + cmake .. -DCMAKE_C_FLAGS='-flto' -DCMAKE_CXX_FLAGS='-flto' -DSTATIC_LIBS=ON make -j3 - name: Run RandomX tests @@ -506,7 +511,7 @@ jobs: cd tests mkdir build cd build - cmake .. -DSTATIC_LIBS=ON -DWITH_LTO=OFF + cmake .. -DCMAKE_C_FLAGS='-flto' -DCMAKE_CXX_FLAGS='-flto' -DSTATIC_LIBS=ON make -j3 - name: Run tests @@ -518,17 +523,20 @@ jobs: - name: Archive binary uses: actions/upload-artifact@v3 with: - name: p2pool-${{ matrix.os }} + name: p2pool-${{ matrix.config.os }} path: build/p2pool build-macos-aarch64: timeout-minutes: 15 - runs-on: ${{ matrix.os }} + runs-on: ${{ matrix.config.os }} strategy: matrix: - os: [macos-11, macos-12] + config: + - {os: "macos-11", target: "arm64-apple-macos-11", xcode: "12.5.1"} + - {os: "macos-12", target: "arm64-apple-macos-12", xcode: "14.2"} + - {os: "macos-13", target: "arm64-apple-macos-13.5", xcode: "15.0"} steps: - name: Checkout repository @@ -537,12 +545,14 @@ jobs: submodules: recursive - name: Install dependencies - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake + run: | + HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake + sudo xcode-select -s /Applications/Xcode_${{ matrix.config.xcode }}.app - name: Build libcurl run: | cd external/src/curl - cmake . -DCMAKE_C_FLAGS='-Os -target arm64-apple-${{ matrix.os }}' -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF + cmake . -DCMAKE_C_FLAGS='-Os -flto -target ${{ matrix.config.target }}' -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF make -j3 cd lib && mkdir .libs && cp libcurl.a .libs @@ -551,7 +561,7 @@ jobs: cd external/src/libuv mkdir build cd build - cmake .. -DCMAKE_C_FLAGS='-Os -target arm64-apple-${{ matrix.os }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF + cmake .. -DCMAKE_C_FLAGS='-Os -flto -target ${{ matrix.config.target }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF make -j3 - name: Build libzmq @@ -559,20 +569,20 @@ jobs: cd external/src/libzmq mkdir build cd build - cmake .. -DCMAKE_C_FLAGS='-Os -target arm64-apple-${{ matrix.os }}' -DCMAKE_CXX_FLAGS='-Os -target arm64-apple-${{ matrix.os }}' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF + cmake .. -DCMAKE_C_FLAGS='-Os -flto -target ${{ matrix.config.target }}' -DCMAKE_CXX_FLAGS='-Os -flto -target ${{ matrix.config.target }}' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF make -j3 - name: Build p2pool run: | mkdir build cd build - cmake .. -DCMAKE_C_FLAGS='-target arm64-apple-${{ matrix.os }}' -DCMAKE_CXX_FLAGS='-target arm64-apple-${{ matrix.os }}' -DSTATIC_BINARY=ON -DARCH_ID=aarch64 -DWITH_LTO=OFF + cmake .. -DCMAKE_C_FLAGS='-flto -target ${{ matrix.config.target }}' -DCMAKE_CXX_FLAGS='-flto -target ${{ matrix.config.target }}' -DSTATIC_BINARY=ON -DARCH_ID=aarch64 make -j3 - name: Archive binary uses: actions/upload-artifact@v3 with: - name: p2pool-${{ matrix.os }}-aarch64 + name: p2pool-${{ matrix.config.os }}-aarch64 path: build/p2pool build-freebsd: diff --git a/.github/workflows/test-sync.yml b/.github/workflows/test-sync.yml index e030afb..2bcc666 100644 --- a/.github/workflows/test-sync.yml +++ b/.github/workflows/test-sync.yml @@ -234,7 +234,7 @@ jobs: sync-test-macos: timeout-minutes: 30 - runs-on: macos-12 + runs-on: macos-13 steps: - name: Checkout repository