diff -U2 -r /var/lib/copr-rpmbuild/results/i2pd-git/upstream-unpacked/Source0/i2pd-openssl/.github/workflows/build-macos.yml /var/lib/copr-rpmbuild/results/i2pd-git/srpm-unpacked/i2pd-openssl.tar.gz-extract/i2pd-openssl/.github/workflows/build-macos.yml --- /var/lib/copr-rpmbuild/results/i2pd-git/upstream-unpacked/Source0/i2pd-openssl/.github/workflows/build-macos.yml 2025-11-07 22:49:58.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/i2pd-git/srpm-unpacked/i2pd-openssl.tar.gz-extract/i2pd-openssl/.github/workflows/build-macos.yml 2025-11-07 21:58:20.000000000 +0000 @@ -19,4 +19,8 @@ - '*' +concurrency: + group: ci-macos + cancel-in-progress: false + jobs: build: @@ -28,7 +32,7 @@ matrix: include: - - target: macos-15 - target-name: ARM64 - - target: macos-15-intel + #- target: macos-latest + # target-name: ARM64 + - target: macos-latest-large target-name: Intel x86_64 @@ -47,7 +51,3 @@ - name: Build application - run: make HOMEBREW=1 USE_UPNP=yes USE_STATIC=yes PREFIX=$GITHUB_WORKSPACE/output -j3 - - - name: Print binary linking - run: otool -L i2pd - + run: make HOMEBREW=1 USE_UPNP=ON PREFIX=$GITHUB_WORKSPACE/output -j3 diff -U2 -r /var/lib/copr-rpmbuild/results/i2pd-git/upstream-unpacked/Source0/i2pd-openssl/Makefile.homebrew /var/lib/copr-rpmbuild/results/i2pd-git/srpm-unpacked/i2pd-openssl.tar.gz-extract/i2pd-openssl/Makefile.homebrew --- /var/lib/copr-rpmbuild/results/i2pd-git/upstream-unpacked/Source0/i2pd-openssl/Makefile.homebrew 2025-11-07 22:49:58.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/i2pd-git/srpm-unpacked/i2pd-openssl.tar.gz-extract/i2pd-openssl/Makefile.homebrew 2025-11-07 21:58:20.000000000 +0000 @@ -1,13 +1,7 @@ # root directory holding homebrew -# brew install boost openssl@3.5 cmake make - -ifeq ($(shell uname -m), x86_64) - BREWROOT = /usr/local -else - BREWROOT = /opt/homebrew -endif - +# brew install boost openssl@3 cmake make +BREWROOT = /opt/homebrew BOOSTROOT = ${BREWROOT}/opt/boost -SSLROOT = ${BREWROOT}/opt/openssl@3.5 +SSLROOT = ${BREWROOT}/opt/openssl@3 UPNPROOT = ${BREWROOT}/opt/miniupnpc @@ -23,5 +17,5 @@ ifeq ($(USE_STATIC),yes) - LDLIBS = -lz ${SSLROOT}/lib/libcrypto.a ${SSLROOT}/lib/libssl.a ${BOOSTROOT}/lib/libboost_program_options.a + LDLIBS = -lz ${SSLROOT}/lib/libcrypto.a ${SSLROOT}/lib/libssl.a ${BOOSTROOT}/lib/libboost_system.a ${BOOSTROOT}/lib/libboost_filesystem.a ${BOOSTROOT}/lib/libboost_program_options.a ifeq ($(USE_UPNP),yes) LDLIBS += ${UPNPROOT}/lib/libminiupnpc.a