From 6ede3726740d831dbe135ea704bc006a26c7c94a Mon Sep 17 00:00:00 2001 From: Lidia Mokevnina Date: Fri, 21 Mar 2025 16:27:49 +0100 Subject: [PATCH] fix macos binary build --- .github/workflows/release.yml | 54 +++-------------------------------- 1 file changed, 4 insertions(+), 50 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 97c528da..570fe059 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,56 +28,10 @@ jobs: make-binary: needs: - code-quality - strategy: - matrix: - os: [ubuntu-20.04, macos-12] - fail-fast: false - runs-on: ${{ matrix.os }} - steps: - - name: 'Install Linux dependencies' - if: matrix.os == 'ubuntu-20.04' - run: | - sudo apt update - sudo apt install -y build-essential squashfs-tools curl gcc make bison - - name: 'Install MacOs dependencies' - if: matrix.os == 'macos-12' - run: | - brew install squashfs - - uses: actions/checkout@v2 - - name: 'Set up Ruby' - uses: ruby/setup-ruby@v1 - with: - ruby-version: '3.0.3' - - name: 'Create Linux Bin' - if: matrix.os == 'ubuntu-20.04' - run: | - wget https://github.com/pmq20/ruby-packer/releases/download/linux-x64/rubyc - chmod +x ./rubyc - ./rubyc --openssl-dir=/etc/ssl ./uffizzi --output=${{ env.LINUX_BIN_PATH }} - - name: 'Create Darwin Bin' - if: matrix.os == 'macos-12' - run: | - export PATH="$(brew --prefix)/opt/openssl@1.1/bin:$PATH" - export LDFLAGS="-L$(brew --prefix)/opt/openssl@1.1/lib" - export CPPFLAGS="-I$(brew --prefix)/opt/openssl@1.1/include" - export PKG_CONFIG_PATH="$(brew --prefix)/opt/openssl@1.1/lib/pkgconfig" - export SSL_CERT_FILE=$(ruby -e "require 'openssl'; puts OpenSSL::X509::DEFAULT_CERT_FILE") - - wget https://github.com/pmq20/ruby-packer/releases/download/darwin-x64/rubyc - chmod +x ./rubyc - ./rubyc --openssl-dir=/etc/ssl ./uffizzi --output=${{ env.DARWIN_BIN_PATH }} - - name: Upload Artifacts - uses: actions/upload-artifact@v4 - if: matrix.os == 'ubuntu-20.04' - with: - name: ${{ env.LINUX_BIN_PATH }} - path: ${{ env.LINUX_BIN_PATH }} - - name: Upload Artifacts - uses: actions/upload-artifact@v4 - if: matrix.os == 'macos-12' - with: - name: ${{ env.DARWIN_BIN_PATH }} - path: ${{ env.DARWIN_BIN_PATH }} + uses: ./.github/workflows/make-binary.yml + with: + linux-bin-path: uffizzi-linux + darwin-bin-path: uffizzi-darwin create_release: runs-on: ubuntu-latest needs: